diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7148ca62027..cf58ab7890c 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -32,7 +32,6 @@ let chroma = enableAcoustid; discogs = enableDiscogs; echonest = enableEchonest; - echonest_tempo = enableEchonest; fetchart = enableFetchart; lastgenre = enableLastfm; lastimport = enableLastfm; @@ -46,8 +45,8 @@ let "bench" "bpd" "bpm" "bucket" "convert" "duplicates" "embedart" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing" - "play" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" - "zero" + "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" + "spotify" "the" "types" "zero" ]; enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins); @@ -55,22 +54,19 @@ let allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins; allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; - # Discogs plugin wants to have an API token, so skip install checks. - allTestablePlugins = remove "discogs" allEnabledPlugins; - testShell = "${bashInteractive}/bin/bash --norc"; completion = "${bashCompletion}/share/bash-completion/bash_completion"; in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.9"; + version = "1.3.10"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "1srhkiyjqx6i3gn20ihf087l5pa77yh5b81ivc52lj491fda7xqk"; + sha256 = "136rvzpygjym6hxq19qwiri5jxx718bbmi471mvc3vibrb7xj1sr"; }; propagatedBuildInputs = [ @@ -104,9 +100,7 @@ in buildPythonPackage rec { ]; patches = [ - ./mediafile-codec-fix.patch ./replaygain-default-audiotools.patch - ./test-bucket-fix-year.patch ]; postPatch = '' @@ -158,10 +152,7 @@ in buildPythonPackage rec { EDITOR="${writeScript "beetconfig.sh" '' #!${stdenv.shell} cat > "$1" < -Date: Wed, 26 Nov 2014 19:04:40 -0800 -Subject: [PATCH] Fix codec reference in MediaFile (fix #1117) - ---- - beets/mediafile.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/beets/mediafile.py b/beets/mediafile.py -index ce42621..a459e09 100644 ---- a/beets/mediafile.py -+++ b/beets/mediafile.py -@@ -1340,8 +1340,9 @@ def __init__(self, path, id3v23=False): - raise FileTypeError(path) - elif (type(self.mgfile).__name__ == 'M4A' or - type(self.mgfile).__name__ == 'MP4'): -- if hasattr(self.mgfile.info, 'codec'): -- if self.mgfile.codec and self.mgfile.codec.startswith('alac'): -+ info = self.mgfile.info -+ if hasattr(info, 'codec'): -+ if info.codec and info.codec.startswith('alac'): - self.type = 'alac' - else: - self.type = 'aac' diff --git a/pkgs/tools/audio/beets/test-bucket-fix-year.patch b/pkgs/tools/audio/beets/test-bucket-fix-year.patch deleted file mode 100644 index 967476006a8..00000000000 --- a/pkgs/tools/audio/beets/test-bucket-fix-year.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 80038e2a3fe6f5ac174a30f6fd01ebf8dd63e414 Mon Sep 17 00:00:00 2001 -From: Fabrice Laporte -Date: Sat, 3 Jan 2015 23:03:29 +0100 -Subject: [PATCH] test_bucket: update test_year_single_year - -2015 was used as an example of date outside of [1970-current year] intervall which is not true anymore ---- - test/test_bucket.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_bucket.py b/test/test_bucket.py -index 4610ec7..060c360 100644 ---- a/test/test_bucket.py -+++ b/test/test_bucket.py -@@ -51,7 +51,7 @@ def test_year_single_year_last_folder(self): - year.""" - self._setup_config(bucket_year=['1950', '1970']) - self.assertEqual(self.plugin._tmpl_bucket('2014'), '1970') -- self.assertEqual(self.plugin._tmpl_bucket('2015'), '2015') -+ self.assertEqual(self.plugin._tmpl_bucket('2025'), '2025') - - def test_year_two_years(self): - """Buckets can be named with the 'from-to' syntax."""