diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:01:13 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:02:05 +0000 |
commit | 515d3cfa24df96c9e134ac5b87c2396f81354551 (patch) | |
tree | 5e67ec19079d3b44ada0c0ac88ccd411ac22070f /pkgs/tools/audio/beets | |
parent | 372bd003cd2d95a181ccd069322d2229f72acd8a (diff) | |
parent | 7bdc103ac8424e08f02f6e9344979d0a821caa62 (diff) | |
download | nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.gz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.bz2 nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.lz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.xz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.zst nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.zip |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/tools/audio/beets')
-rw-r--r-- | pkgs/tools/audio/beets/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/audio/beets/mutagen-1.43.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index b4dfa71ca96..1eb8dd114f5 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -177,6 +177,7 @@ in pythonPackages.buildPythonApplication rec { patches = [ ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch + ./mutagen-1.43.patch ]; postPatch = '' diff --git a/pkgs/tools/audio/beets/mutagen-1.43.patch b/pkgs/tools/audio/beets/mutagen-1.43.patch new file mode 100644 index 00000000000..84cf1bab03e --- /dev/null +++ b/pkgs/tools/audio/beets/mutagen-1.43.patch @@ -0,0 +1,29 @@ +Backport https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868 +to Beets 1.4.9. + +diff --git i/setup.py w/setup.py +index 79278f8..b8d6068 100755 +--- i/setup.py ++++ w/setup.py +@@ -87,7 +87,7 @@ setup( + + install_requires=[ + 'six>=1.9', +- 'mutagen>=1.33', ++ 'mutagen>=1.43', + 'unidecode', + 'musicbrainzngs>=0.4', + 'pyyaml', +diff --git i/test/test_mediafile.py w/test/test_mediafile.py +index 36a2c53..54ef9dd 100644 +--- i/test/test_mediafile.py ++++ w/test/test_mediafile.py +@@ -912,7 +912,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase): + 'bitrate': 705600, + 'format': u'AIFF', + 'samplerate': 44100, +- 'bitdepth': 0, ++ 'bitdepth': 16, + 'channels': 1, + } + |