From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 0/5] New version of beets Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163044556117610 (code B ref -1); Tue, 31 Aug 2021 21:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2021 21:32:41 +0000 Received: from localhost ([127.0.0.1]:35580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBN2-0004Zy-QX for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:32:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:43382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBMy-0004Zm-MF for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBMy-0006Zz-FL for guix-patches@gnu.org; Tue, 31 Aug 2021 17:32:36 -0400 Received: from smtprelay02.ispgateway.de ([80.67.31.29]:11965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBMw-0008N0-Rm for guix-patches@gnu.org; Tue, 31 Aug 2021 17:32:36 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay02.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBLR-0004en-Gw; Tue, 31 Aug 2021 23:31:01 +0200 From: Simon Streit Date: Tue, 31 Aug 2021 22:49:29 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn Received-SPF: none client-ip=80.67.31.29; envelope-from=simon@netpanic.org; helo=smtprelay02.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Here a little collection of patches to update beets. Beets-bandcamp is included in this series although it is not a dependency of beets. I merely stumbled across it being not up to date while checking version numbers. This update of beets has long been waited for. Hence there was another package (beets-next) with a more recent checkout so that it would be possible to have a more recent version than 1.4.9. With 1.5.0 I believe that we do not need beets-next anymore. Thus I removed it. It was also possible to remove some patches too. Now to beets. Since my skills with packaging are not quite advanced yet, I did try my best to modify the definition to accommodate the new version. Along the way, I noticed -- even with v1.4.9 -- beets would not find the fpcalc. Fpcalc is part of chromaprint and while this package is an optional dependency, I put it into propagated-inputs and solved this issue somehow. But I'm still not quite sure if the inputs are done in the right way? The inputs from =E2=80=9Cguix import pypi beets=E2=80=9D look very differen= t from the package definition that was laid out before. This suggestion from import would fail if I pushed it to my local repository and pulled. I left it as it is for the time being. Hope this is acceptable.=20 Kind regards, Simon Simon Streit (5): gnu: python-confuse: Update to 1.5.0. gnu: python-pyacoustid: Update to 1.2.1. gnu: python-mediafile: Update to 0.7.0. gnu: beets-bandcamp: Update to 0.1.4. gnu: beets: Update to 1.5.0. gnu/packages/mp3.scm | 7 +- gnu/packages/music.scm | 119 ++++++------------ .../patches/beets-werkzeug-compat.patch | 18 --- .../patches/python-mediafile-wavpack.patch | 57 --------- gnu/packages/python-xyz.scm | 7 +- 5 files changed, 44 insertions(+), 164 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch -- 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 1/5] gnu: python-confuse: Update to 1.5.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044601018394 (code B ref 50309); Tue, 31 Aug 2021 21:41:01 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:40:10 +0000 Received: from localhost ([127.0.0.1]:35589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUI-0004ma-E9 for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:10 -0400 Received: from smtprelay06.ispgateway.de ([80.67.31.95]:32658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUF-0004mJ-7w for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:09 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay06.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBRt-0006CC-1f; Tue, 31 Aug 2021 23:37:41 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 20:51:43 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/python-xyz.scm (python-confuse): Update to 1.5.0. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 59eb473857..b61b585713 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -106,6 +106,7 @@ ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Hugo Lecomte ;;; Copyright =C2=A9 2021 Franck P=C3=A9rignon +;;; Copyright =C2=A9 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -25669,20 +25670,20 @@ Qt applications.") (define-public python-confuse (package (name "python-confuse") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "confuse" version)) (sha256 (base32 - "0r74djc8r6lfx6ldsqnhpvfsn256gsfzbl33qcm77hp2qr8h9z4j")))) + "0bh2kyj8wd7h9gg4nsvrbykl5ly0f70f0wi3fbm204b1f0fcmywj")))) (build-system python-build-system) (propagated-inputs `(("python-pathlib" ,python-pathlib) ("python-pyyaml" ,python-pyyaml))) (home-page "https://github.com/beetbox/confuse") - (synopsis "Painless YAML configuration.") + (synopsis "Painless YAML configuration") (description "Confuse is a configuration library for Python that uses YAML. It takes care of defaults, overrides, type checking, command-line integration, human-readable errors, and standard OS-specific locations.") -- 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 2/5] gnu: python-pyacoustid: Update to 1.2.1. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044603718451 (code B ref 50309); Tue, 31 Aug 2021 21:41:01 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:40:37 +0000 Received: from localhost ([127.0.0.1]:35592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUi-0004nX-Qk for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:37 -0400 Received: from smtprelay08.ispgateway.de ([134.119.228.111]:31960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBUg-0004nN-3b for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:40:35 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay08.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBTY-0003dW-Jd; Tue, 31 Aug 2021 23:39:24 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 20:57:06 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/mp3.scm (python-pyacoustid): Update to 1.2.1. --- gnu/packages/mp3.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9de9055e51..2ad19e9e10 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -8,6 +8,7 @@ ;;; Copyright =C2=A9 2018=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -645,19 +646,19 @@ FFmpeg, etc.") (define-public python-pyacoustid (package (name "python-pyacoustid") - (version "1.1.7") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pyacoustid" version)) (sha256 (base32 - "1zan6c22ca6sjy0g9ajwjp6mkzw7jv8r3n7jzska09a6x254lf87")))) + "115svv5mkz6lq4rzwpjgs61psprmbl7p0bwdfl4dbsn5zcljjaz6")))) (build-system python-build-system) (propagated-inputs `(("python-audioread" ,python-audioread) ("python-requests" ,python-requests))) - (home-page "https://github.com/sampsyo/pyacoustid") + (home-page "https://github.com/beetbox/pyacoustid") (synopsis "Bindings for Chromaprint acoustic fingerprinting") (description "This package provides bindings for the Chromaprint acoustic --=20 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 3/5] gnu: python-mediafile: Update to 0.7.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044608818557 (code B ref 50309); Tue, 31 Aug 2021 21:42:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:41:28 +0000 Received: from localhost ([127.0.0.1]:35597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVT-0004p8-4h for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:28 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:14323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVR-0004oz-Bt for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:22 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBVv-0003rI-W7; Tue, 31 Aug 2021 23:41:52 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 21:05:01 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Remove patch. It is now included in upstream release. * gnu/packages/music.scm (python-mediafile): Update to 0.7.0. * gnu/packages/patches/python-mediafile-wavpack.patch: Delete patch. --- gnu/packages/music.scm | 7 ++- .../patches/python-mediafile-wavpack.patch | 57 ------------------- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b95be813dc..c417e22804 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -41,6 +41,7 @@ ;;; Copyright =C2=A9 2021 Rovanion Luckey ;;; Copyright =C2=A9 2021 Justin Veilleux ;;; Copyright =C2=A9 2021 Felix Gruber +;;; Copyright =C2=A9 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3604,15 +3605,15 @@ streams on an individual packet/page level.") (define-public python-mediafile (package (name "python-mediafile") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "mediafile" version)) - (patches (search-patches "python-mediafile-wavpack.patch")) + ;; (patches (search-patches "python-mediafile-wavpack.patch")) (sha256 (base32 - "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + "0fvxhiypf5qp1m9gzd0bik5wnfcm8sd7xivd02d6d0ml85qxwcwg")))) (build-system python-build-system) (propagated-inputs `(("python-mutagen" ,python-mutagen) diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/pack= ages/patches/python-mediafile-wavpack.patch deleted file mode 100644 index 9839fe87b5..0000000000 --- a/gnu/packages/patches/python-mediafile-wavpack.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch has already been applied upstream, but is not included in the -current release 0.6.0. - -From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 -From: Adrian Sampson -Date: Wed, 29 Jul 2020 19:42:57 -0400 -Subject: [PATCH] Fix test for WavPack bitrate - -Fixes #34. ---- - docs/index.rst | 5 +++++ - mediafile.py | 2 +- - test/test_mediafile.py | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/docs/index.rst b/docs/index.rst -index 7b622df..1465405 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -100,6 +100,11 @@ Internals - Changelog - --------- -=20 -+v0.7.0 -+'''''' -+ -+- Mutagen 1.45.0 or later is now required. -+ - v0.6.0 - '''''' -=20 -diff --git a/mediafile.py b/mediafile.py -index 23fadaf..9e9d063 100644 ---- a/mediafile.py -+++ b/mediafile.py -@@ -56,7 +56,7 @@ - import six -=20 -=20 --__version__ =3D '0.6.0' -+__version__ =3D '0.7.0' - __all__ =3D ['UnreadableFileError', 'FileTypeError', 'MediaFile'] -=20 - log =3D logging.getLogger(__name__) -diff --git a/test/test_mediafile.py b/test/test_mediafile.py -index e9e1850..7f17f44 100644 ---- a/test/test_mediafile.py -+++ b/test/test_mediafile.py -@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase= ): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } -=20 --=20 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 4/5] gnu: beets-bandcamp: Update to 0.1.4. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044610618589 (code B ref 50309); Tue, 31 Aug 2021 21:42:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:41:46 +0000 Received: from localhost ([127.0.0.1]:35600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVq-0004pl-Ee for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:46 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:52761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVo-0004pd-W4 for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:45 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBWK-0005LQ-De; Tue, 31 Aug 2021 23:42:16 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 22:44:25 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/music.scm (beets-bandcamp): Update to 0.1.4. --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c417e22804..63c6ac7d19 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3919,13 +3919,13 @@ websites such as Libre.fm.") (define-public beets-bandcamp (package (name "beets-bandcamp") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (pypi-uri "beets-bandcamp" version)) (sha256 (base32 - "04awg0zdhhg5h510fc1p3qkvr2l1qm6nf85hlr9z8im8a7xlka0i")))) + "0dwbdkrb9c0ppzm5s78h47ndpr88cw1k0z8fgfhkl706wazx2ddg")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests (propagated-inputs -- 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 5/5] gnu: beets: Update to 1.5.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044613218661 (code B ref 50309); Tue, 31 Aug 2021 21:43:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:42:12 +0000 Received: from localhost ([127.0.0.1]:35605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBWF-0004qu-Li for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:42:12 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.32]:54263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBWC-0004qj-Cs for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:42:10 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBU2-0006O8-Od; Tue, 31 Aug 2021 23:39:54 +0200 From: Simon Streit Date: Tue, 31 Aug 2021 22:11:51 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/music.scm (beets): Update to 1.5.0. * gnu/packages/music.scm (beets-next): Delete variable. * gnu/packages/patches/beets-werkzeug-compat.patch: Delete patch. --- gnu/packages/music.scm | 108 +++++------------- .../patches/beets-werkzeug-compat.patch | 18 --- 2 files changed, 30 insertions(+), 96 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 63c6ac7d19..8158a40e49 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3788,34 +3788,32 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) - (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 - "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) + "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Reported upstream: . - ;; Disable the faulty test as the fix is unclear. + ;; Test fails. Reported upstream: + ;; https://github.com/beetbox/beets/issues/4037. (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "test/test_mediafile.py" - (("def test_read_audio_properties") "def _test_read_audio_properties")) + (substitute* "test/test_zero.py" + (("def test_album_art") "def _test_album_art")) #t)) (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) (replace 'check - (lambda _ - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. + (lambda _ (invoke "nosetests" "-v"))) + ;; Wrap the executable, so it can find python-gi (aka + ;; pygobject) and gstreamer plugins. (add-after 'wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") @@ -3826,9 +3824,14 @@ websites such as Libre.fm.") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) `("GI_TYPELIB_PATH" ":" prefix (,types))) #t)))))) + (propagated-inputs + `(("chromaprint" ,chromaprint))) (native-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + `(("gobject-introspection" ,gobject-introspection) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-confuse" ,python-confuse) ("python-flask" ,python-flask) + ("python-mediafile" ,python-mediafile) ("python-mock" ,python-mock) ("python-mpd2" ,python-mpd2) ("python-nose" ,python-nose) @@ -3839,83 +3842,32 @@ websites such as Libre.fm.") ("python-responses" ,python-responses))) ;; TODO: Install optional plugins and dependencies. (inputs - `(("python-discogs-client" ,python-discogs-client) + `(("bash-minimal" ,bash-minimal) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("opusfile" ,opusfile) + ("python-discogs-client" ,python-discogs-client) ("python-jellyfish" ,python-jellyfish) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) ("python-mutagen" ,python-mutagen) ("python-pyacoustid" ,python-pyacoustid) - ("python-pyyaml" ,python-pyyaml) - ("python-unidecode" ,python-unidecode) ;; For plugin replaygain. ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer))) + ("python-pyyaml" ,python-pyyaml) + ("python-reflink" ,python-reflink) + ("python-requests-oauthlib" ,python-requests-oauthlib) + ("python-unidecode" ,python-unidecode))) (home-page "https://beets.io") (synopsis "Music organizer") - (description "The purpose of beets is to get your music collection right - once and for all. It catalogs your collection, automatically improving its - metadata as it goes using the MusicBrainz database. Then it provides a variety - of tools for manipulating and accessing your music.") + (description "The purpose of beets is to get your music collection +right once and for all. It catalogs your collection, automatically +improving its metadata as it goes using the MusicBrainz database. +Then it provides a variety of tools for manipulating and accessing +your music.") (license license:expat))) -(define-public beets-next - (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") - (revision "1")) - (package - (inherit beets) - (name "beets-next") - (version (git-version (package-version beets) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beetbox/beets") - (commit commit))) - (file-name (git-file-name "beets" version)) - (sha256 - (base32 - "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; XXX: unclear why this fails - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_zero.py" - (("def test_album_art") "def _test_album_art")) - #t)) - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" (string-append (getcwd) "/tmp")) - #t)) - (replace 'check - (lambda _ - ;; Resources must be writable. - (for-each make-file-writable - (find-files "test/rsrc" ".")) - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. - (add-after 'wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/beet")) - (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) - (types (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) - `("GI_TYPELIB_PATH" ":" prefix (,types))) - #t)))))) - (inputs - `(("python-confuse" ,python-confuse) - ("python-mediafile" ,python-mediafile) - ("python-reflink" ,python-reflink) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("opusfile" ,opusfile) - ,@(package-inputs beets)))))) - (define-public beets-bandcamp (package (name "beets-bandcamp") diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch deleted file mode 100644 index 1a91c3a3f9..0000000000 --- a/gnu/packages/patches/beets-werkzeug-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Be compatible with python-werkzeug 1.0.0. - -Taken from upstream: -https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 - -diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py -index f53fb3a954..21ff5d94ed 100644 ---- a/beetsplug/web/__init__.py -+++ b/beetsplug/web/__init__.py -@@ -169,7 +169,7 @@ def to_python(self, value): - return ids - - def to_url(self, value): -- return ','.join(value) -+ return ','.join(str(v) for v in value) - - - class QueryConverter(PathConverter): -- 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 0/5] New version of beets Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Simon Streit , 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044652119276 (code B ref 50309); Tue, 31 Aug 2021 21:49:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:48:41 +0000 Received: from localhost ([127.0.0.1]:35610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBcT-00050j-L1 for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:48:41 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:38840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBcO-00050W-K4 for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:48:36 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id oMoW2500G0mfAB406MoWjS; Tue, 31 Aug 2021 23:48:31 +0200 Message-ID: From: Maxime Devos Date: Tue, 31 Aug 2021 23:48:25 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-cLMhVVtj0RIFlbR9AOvv" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1630446511; bh=axthuWgfrreZsgNkmEzC0q5VRIW3a8GElQtytseH+o8=; h=Subject:From:To:Date:In-Reply-To:References; b=GJrOXwP7lEaxllluhWVFSnOKNoTqvf6sfpj0SmRj1MXtCxIloRzimr5M9yn51GBzq 2xfP1L3JU1i1f0+osAyyjcuwu8VTaiLwM8DoTGzbMGn/QDH8gm+18VQF91dw0NfdBo x2wqjnFylodOIWxJm5p517L8YhT66dta8WsAAIyZFbRdwv9njEQmKU41rakbtjL3fk OU/T+eqd8ZbdyqNviL6hRsWhOhSAQWvzULA1VTSsT5zmVnivaQTz8sexiF/TLOwUjp vrdbAXff4cPfcTEB7HvulECJSHjddnBQwFOX5z8/Eh0rldNWDPw22fGTkAspog1roA oAKRDdRdGeoDQ== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-cLMhVVtj0RIFlbR9AOvv Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Simon Streit schreef op di 31-08-2021 om 22:49 [+0200]: > Now to beets. [...] > Along the way, I noticed -- even with v1.4.9 -- beets would > not find the fpcalc. Fpcalc is part of chromaprint and while this > package is an optional dependency, I put it into propagated-inputs and > solved this issue somehow. beets is probably searching for 'fpcalc' in $PATH, instead of using a strin= g like /gnu/store/.../bin/fpcalc. This can usually be resolved with substitu= te*, to turn something like 'system("fpcalc --stuff")' into 'system("/gnu/store/.../bin/fpcalc --stuff")' (that's for C code, the pytho= n equivalent might be a little different). Greetings, Maxime. --=-cLMhVVtj0RIFlbR9AOvv Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYS6jqRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tRHAP9O1ryGbyW+i/iQ+Wmjsvn2554P NoJuobxiX9IIRBHroAEAkfBanD78shAmixl69+1pVJ3p1Wa6fQ8/nzlOEL7UEwo= =OPQ0 -----END PGP SIGNATURE----- --=-cLMhVVtj0RIFlbR9AOvv-- From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 0/5] New version of beets Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Sep 2021 07:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163048097410991 (code B ref 50309); Wed, 01 Sep 2021 07:23:02 +0000 Received: (at 50309) by debbugs.gnu.org; 1 Sep 2021 07:22:54 +0000 Received: from localhost ([127.0.0.1]:36051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLKa9-0002r8-IM for submit@debbugs.gnu.org; Wed, 01 Sep 2021 03:22:54 -0400 Received: from smtprelay01.ispgateway.de ([80.67.18.13]:14809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLKa3-0002qu-Kq for 50309@debbugs.gnu.org; Wed, 01 Sep 2021 03:22:48 -0400 Received: from [2.247.248.75] (helo=milk) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLKaX-0004aj-W0; Wed, 01 Sep 2021 09:23:14 +0200 From: Simon Streit References: Gcc: nnfolder+archive:sent.2021-09 Date: Wed, 01 Sep 2021 09:22:40 +0200 In-Reply-To: (Maxime Devos's message of "Tue, 31 Aug 2021 23:48:25 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxime! Maxime Devos writes: > Simon Streit schreef op di 31-08-2021 om 22:49 [+0200]: >> Along the way, I noticed -- even with v1.4.9 -- beets would >> not find the fpcalc. Fpcalc is part of chromaprint and while this >> package is an optional dependency, I put it into propagated-inputs and >> solved this issue somehow. > > beets is probably searching for 'fpcalc' in $PATH, instead of using a string > like /gnu/store/.../bin/fpcalc. This can usually be resolved with substitute*, > to turn something like 'system("fpcalc --stuff")' into > 'system("/gnu/store/.../bin/fpcalc --stuff")' (that's for C code, the python > equivalent might be a little different). Thanks for pointing this out. I modified it and placed a wrapper so that beets can find chromaprint. ### Begin Patch ### gnu: beets: Update to 1.5.0. Remove beets-next, and remove patch. * gnu/packages/music.scm (beets): Update to 1.5.0. * gnu/packages/music.scm (beets-next): Delete variable. * gnu/packages/patches/beets-werkzeug-compat.patch: Delete patch. --- gnu/packages/music.scm | 120 ++++++------------ .../patches/beets-werkzeug-compat.patch | 18 --- 2 files changed, 42 insertions(+), 96 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 63c6ac7d19..51e760e866 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3788,34 +3788,45 @@ websites such as Libre.fm.") (define-public beets (package (name "beets") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) - (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 - "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) + "0arl4nc3y8iwa331hf6ggai19y8ns9pl03g5d6ac857wq2x7nzw8")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Reported upstream: . - ;; Disable the faulty test as the fix is unclear. + ;; Test fails. Reported upstream: + ;; https://github.com/beetbox/beets/issues/4037. (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "test/test_mediafile.py" - (("def test_read_audio_properties") "def _test_read_audio_properties")) + (substitute* "test/test_zero.py" + (("def test_album_art") "def _test_album_art")) #t)) (add-after 'unpack 'set-HOME (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")) #t)) (replace 'check - (lambda _ - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. + (lambda _ (invoke "nosetests" "-v"))) + ;; Wrap the executable, so it can find chromaprint (fpcalc). + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (chromaprint (assoc-ref inputs "chromaprint"))) + (wrap-program (string-append out "/bin/beet") + `("XDG_DATA_DIRS" ":" prefix (,out)) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin:" + dir "/sbin")) + (list chromaprint)))) + #t))) + ;; Wrap the executable, so it can find python-gi (aka + ;; pygobject) and gstreamer plugins. (add-after 'wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") @@ -3827,8 +3838,11 @@ websites such as Libre.fm.") `("GI_TYPELIB_PATH" ":" prefix (,types))) #t)))))) (native-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) + `(("gobject-introspection" ,gobject-introspection) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-confuse" ,python-confuse) ("python-flask" ,python-flask) + ("python-mediafile" ,python-mediafile) ("python-mock" ,python-mock) ("python-mpd2" ,python-mpd2) ("python-nose" ,python-nose) @@ -3839,83 +3853,33 @@ websites such as Libre.fm.") ("python-responses" ,python-responses))) ;; TODO: Install optional plugins and dependencies. (inputs - `(("python-discogs-client" ,python-discogs-client) + `(("bash-minimal" ,bash-minimal) + ("chromaprint" ,chromaprint) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gstreamer" ,gstreamer) + ("opusfile" ,opusfile) + ("python-discogs-client" ,python-discogs-client) ("python-jellyfish" ,python-jellyfish) ("python-munkres" ,python-munkres) ("python-musicbrainzngs" ,python-musicbrainzngs) ("python-mutagen" ,python-mutagen) ("python-pyacoustid" ,python-pyacoustid) - ("python-pyyaml" ,python-pyyaml) - ("python-unidecode" ,python-unidecode) ;; For plugin replaygain. ("python-pygobject" ,python-pygobject) - ("gobject-introspection" ,gobject-introspection) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gstreamer" ,gstreamer))) + ("python-pyyaml" ,python-pyyaml) + ("python-reflink" ,python-reflink) + ("python-requests-oauthlib" ,python-requests-oauthlib) + ("python-unidecode" ,python-unidecode))) (home-page "https://beets.io") (synopsis "Music organizer") - (description "The purpose of beets is to get your music collection right - once and for all. It catalogs your collection, automatically improving its - metadata as it goes using the MusicBrainz database. Then it provides a variety - of tools for manipulating and accessing your music.") + (description "The purpose of beets is to get your music collection +right once and for all. It catalogs your collection, automatically +improving its metadata as it goes using the MusicBrainz database. +Then it provides a variety of tools for manipulating and accessing +your music.") (license license:expat))) -(define-public beets-next - (let ((commit "04ea754d00e2873ae9aa2d9e07c5cefd790eaee2") - (revision "1")) - (package - (inherit beets) - (name "beets-next") - (version (git-version (package-version beets) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beetbox/beets") - (commit commit))) - (file-name (git-file-name "beets" version)) - (sha256 - (base32 - "092a9sss2shhcjmpgbwvscv8brpm5970i5hddkhi81xcff3bg1h4")))) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; XXX: unclear why this fails - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "test/test_zero.py" - (("def test_album_art") "def _test_album_art")) - #t)) - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" (string-append (getcwd) "/tmp")) - #t)) - (replace 'check - (lambda _ - ;; Resources must be writable. - (for-each make-file-writable - (find-files "test/rsrc" ".")) - (invoke "nosetests" "-v"))) - ;; Wrap the executable, so it can find python-gi (aka pygobject) and - ;; gstreamer plugins. - (add-after 'wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/beet")) - (plugins (getenv "GST_PLUGIN_SYSTEM_PATH")) - (types (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,plugins)) - `("GI_TYPELIB_PATH" ":" prefix (,types))) - #t)))))) - (inputs - `(("python-confuse" ,python-confuse) - ("python-mediafile" ,python-mediafile) - ("python-reflink" ,python-reflink) - ("python-requests-oauthlib" ,python-requests-oauthlib) - ("opusfile" ,opusfile) - ,@(package-inputs beets)))))) - (define-public beets-bandcamp (package (name "beets-bandcamp") diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch deleted file mode 100644 index 1a91c3a3f9..0000000000 --- a/gnu/packages/patches/beets-werkzeug-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Be compatible with python-werkzeug 1.0.0. - -Taken from upstream: -https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 - -diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py -index f53fb3a954..21ff5d94ed 100644 ---- a/beetsplug/web/__init__.py -+++ b/beetsplug/web/__init__.py -@@ -169,7 +169,7 @@ def to_python(self, value): - return ids - - def to_url(self, value): -- return ','.join(value) -+ return ','.join(str(v) for v in value) - - - class QueryConverter(PathConverter): -- 2.33.0 From unknown Wed Sep 10 06:21:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 0/5] New version of beets Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Sep 2021 07:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Simon Streit Cc: 50309@debbugs.gnu.org, Maxime Devos Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.1630569531658 (code B ref 50309); Thu, 02 Sep 2021 07:59:01 +0000 Received: (at 50309) by debbugs.gnu.org; 2 Sep 2021 07:58:51 +0000 Received: from localhost ([127.0.0.1]:39660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLhcV-0000AU-8I for submit@debbugs.gnu.org; Thu, 02 Sep 2021 03:58:51 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:15654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLhcQ-0000AC-9A for 50309@debbugs.gnu.org; Thu, 02 Sep 2021 03:58:46 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4H0YG35vxWzQk4q; Thu, 2 Sep 2021 09:58:35 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1630569514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+psuZuvuqNCU9lAM8Cbb9s6O0SlEBIcwiyat1OXWxDs=; b=bLXggzPdqnCvCl0CnHjuy09DKq1oa7fLOmm+zazp5u6/dT1TQwrUx26O/q6dbPIGRM5qjB sYUnDe/mddO3rKojDpD2ivboCd9iJPpbi52GccWMmpigHvP1W54cew5L+akLMz85IHajRm jslvwcSb9BDw8/xRpK0OkEmipwJVOnTMEEha4fpfGNIuxOHCu2ufJR3SVR4xJ5qy/hyyd5 mG10vQNDlmr6P0dLBiWj8EmEwhd12vG62kw5F/wOLbZvZfDYvmdQaCxPugGR0ZuSbW2udd sQXWjme2b2zLCzGpixPS+UJBJ56+L5hFfHTiPOOhWiNMLJ2tDLwzvFDEGNn6VQ== Date: Thu, 2 Sep 2021 09:58:31 +0200 From: Lars-Dominik Braun Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 094C2353 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Simon, > Thanks for pointing this out. I modified it and placed a wrapper so > that beets can find chromaprint. this is not a proper solution unfortunately, because beets itself is not looking for fpcalc, but the package python-pyacoustid. I’m currently checking your patchset and upgrading beets, but some of beets’ dependencies are in a bad shape (like python-pyacoustid) and need more than just version bumps. I’ll fix these and push everything when I’m done. Cheers, Lars From unknown Wed Sep 10 06:21:06 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Simon Streit Subject: bug#50309: closed (Re: [bug#50309] [PATCH 0/5] New version of beets) Message-ID: References: X-Gnu-PR-Message: they-closed 50309 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 50309@debbugs.gnu.org Date: Sat, 04 Sep 2021 13:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1630761062-16105-1" This is a multi-part message in MIME format... ------------=_1630761062-16105-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #50309: [PATCH 0/5] New version of beets which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 50309@debbugs.gnu.org. --=20 50309: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D50309 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1630761062-16105-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 50309-done) by debbugs.gnu.org; 4 Sep 2021 13:10:21 +0000 Received: from localhost ([127.0.0.1]:46861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMVR7-0004As-3N for submit@debbugs.gnu.org; Sat, 04 Sep 2021 09:10:21 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:9688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mMVR4-0004Af-Qp for 50309-done@debbugs.gnu.org; Sat, 04 Sep 2021 09:10:19 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4H1w4h4D6BzQjf4; Sat, 4 Sep 2021 15:10:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1630761010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4PdesAGGs65Hpopm4HJ8DjezoWZ24nrbNc7n3fNtn18=; b=toMt44upz7y8WEQhIRdgzx6Ke0ZaqaWTo6prKwki8GIig5+6sBopT+ElNxMWogtwOjo9C8 0Cy6fX/JtJF2jfv/f50Simmy8njjEF5uNogxtdsOy5Cuq+/46+bkrqRveUu3vIuLDlkWQP PXyaph9gf37gaI2R/cdVKrIwQdGPuRsW/pus8cfZNMzruQtJK7jNao4Z7QqxOJjeIZwRh0 m2AErFuLpEFPg+Y7S90hoHEXGueGeQCXXOOjQ06Btv0QnkMdfgBy2NPwxlI0u0GOGGTxg8 UIvs5hY74tqz8IszuY5hb+Pjj7yKwPl3mA6AIx66YZtTrGH4p0ByUXoZIPuagA== Date: Sat, 4 Sep 2021 15:10:08 +0200 From: Lars-Dominik Braun To: Simon Streit Subject: Re: [bug#50309] [PATCH 0/5] New version of beets Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: D702F267 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50309-done Cc: 50309-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, I pushed pushed this patch set with modifications and additions as 8ceb7651c2aff73644a49c1d72fe8b63948f0240 and following. Cheers, Lars ------------=_1630761062-16105-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Aug 2021 21:32:41 +0000 Received: from localhost ([127.0.0.1]:35580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBN2-0004Zy-QX for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:32:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:43382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBMy-0004Zm-MF for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:32:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBMy-0006Zz-FL for guix-patches@gnu.org; Tue, 31 Aug 2021 17:32:36 -0400 Received: from smtprelay02.ispgateway.de ([80.67.31.29]:11965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBMw-0008N0-Rm for guix-patches@gnu.org; Tue, 31 Aug 2021 17:32:36 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay02.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBLR-0004en-Gw; Tue, 31 Aug 2021 23:31:01 +0200 From: Simon Streit To: guix-patches@gnu.org Subject: [PATCH 0/5] New version of beets Date: Tue, 31 Aug 2021 22:49:29 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn Received-SPF: none client-ip=80.67.31.29; envelope-from=simon@netpanic.org; helo=smtprelay02.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Here a little collection of patches to update beets. Beets-bandcamp is included in this series although it is not a dependency of beets. I merely stumbled across it being not up to date while checking version numbers. This update of beets has long been waited for. Hence there was another package (beets-next) with a more recent checkout so that it would be possible to have a more recent version than 1.4.9. With 1.5.0 I believe that we do not need beets-next anymore. Thus I removed it. It was also possible to remove some patches too. Now to beets. Since my skills with packaging are not quite advanced yet, I did try my best to modify the definition to accommodate the new version. Along the way, I noticed -- even with v1.4.9 -- beets would not find the fpcalc. Fpcalc is part of chromaprint and while this package is an optional dependency, I put it into propagated-inputs and solved this issue somehow. But I'm still not quite sure if the inputs are done in the right way? The inputs from =E2=80=9Cguix import pypi beets=E2=80=9D look very differen= t from the package definition that was laid out before. This suggestion from import would fail if I pushed it to my local repository and pulled. I left it as it is for the time being. Hope this is acceptable.=20 Kind regards, Simon Simon Streit (5): gnu: python-confuse: Update to 1.5.0. gnu: python-pyacoustid: Update to 1.2.1. gnu: python-mediafile: Update to 0.7.0. gnu: beets-bandcamp: Update to 0.1.4. gnu: beets: Update to 1.5.0. gnu/packages/mp3.scm | 7 +- gnu/packages/music.scm | 119 ++++++------------ .../patches/beets-werkzeug-compat.patch | 18 --- .../patches/python-mediafile-wavpack.patch | 57 --------- gnu/packages/python-xyz.scm | 7 +- 5 files changed, 44 insertions(+), 164 deletions(-) delete mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch -- 2.33.0 ------------=_1630761062-16105-1--