[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/37: gnu: beets: Fix build with newer Werkzeug.
From: |
guix-commits |
Subject: |
13/37: gnu: beets: Fix build with newer Werkzeug. |
Date: |
Mon, 16 Mar 2020 10:46:23 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit e76cbdcd90e603d98f9d074aa2ee0788c65d97df
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Mar 16 04:39:17 2020 +0100
gnu: beets: Fix build with newer Werkzeug.
* gnu/packages/patches/beets-werkzeug-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/music.scm (beets)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/music.scm | 1 +
gnu/packages/patches/beets-werkzeug-compat.patch | 18 ++++++++++++++++++
3 files changed, 20 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1dd7e0a..5cde920 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -756,6 +756,7 @@ dist_patch_DATA =
\
%D%/packages/patches/bash-completion-directories.patch \
%D%/packages/patches/bastet-change-source-of-unordered_set.patch \
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
+ %D%/packages/patches/beets-werkzeug-compat.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/benchmark-unbundle-googletest.patch \
%D%/packages/patches/biber-fix-encoding-write.patch \
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index f6585f6..fd9cd6c 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2941,6 +2941,7 @@ Songs can be searched by artist, name or even by a part
of the song text.")
(source (origin
(method url-fetch)
(uri (pypi-uri "beets" version))
+ (patches (search-patches "beets-werkzeug-compat.patch"))
(sha256
(base32
"0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj"))))
diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch
b/gnu/packages/patches/beets-werkzeug-compat.patch
new file mode 100644
index 0000000..1a91c3a
--- /dev/null
+++ b/gnu/packages/patches/beets-werkzeug-compat.patch
@@ -0,0 +1,18 @@
+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):
- 06/37: gnu: python-flask-wtf: Update to 0.14.3., (continued)
- 06/37: gnu: python-flask-wtf: Update to 0.14.3., guix-commits, 2020/03/16
- 09/37: gnu: python-flask-restful-swagger: Update to 0.20.1., guix-commits, 2020/03/16
- 15/37: gnu: Remove python2-keystoneclient., guix-commits, 2020/03/16
- 12/37: gnu: Remove python2-flask-migrate., guix-commits, 2020/03/16
- 20/37: gnu: Remove python2-oslo.utils., guix-commits, 2020/03/16
- 23/37: gnu: Remove python2-gitpython., guix-commits, 2020/03/16
- 03/37: gnu: python-flask: Update to 1.1.1., guix-commits, 2020/03/16
- 04/37: gnu: python-flask-login: Update to 0.5.0., guix-commits, 2020/03/16
- 18/37: gnu: Remove python2-oslo.log., guix-commits, 2020/03/16
- 14/37: gnu: Remove git-annex-remote-hubic., guix-commits, 2020/03/16
- 13/37: gnu: beets: Fix build with newer Werkzeug.,
guix-commits <=
- 22/37: gnu: Remove python2-bandit., guix-commits, 2020/03/16
- 07/37: gnu: python-flask-restful: Update to 0.3.8., guix-commits, 2020/03/16
- 10/37: gnu: python-flask-migrate: Update to 2.5.3., guix-commits, 2020/03/16
- 17/37: gnu: Remove python2-tempest-lib., guix-commits, 2020/03/16
- 08/37: gnu: python-stdnum: Update to 1.13., guix-commits, 2020/03/16
- 16/37: gnu: Remove python2-swiftclient., guix-commits, 2020/03/16
- 21/37: gnu: Remove python2-oslo.config., guix-commits, 2020/03/16
- 26/37: gnu: python-gevent: Update to 1.4.0., guix-commits, 2020/03/16
- 33/37: gnu: python-zope-configuration: Update to 4.3.1., guix-commits, 2020/03/16
- 24/37: gnu: Remove python2-gitdb., guix-commits, 2020/03/16