From 9037f608ae6cee590cb6a1eeda612ce43c36f7f8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 29 Jun 2018 21:11:13 +0200
Subject: [PATCH] beets: 1.4.6 -> 1.4.7

The upstream release notes are a bit bigger, so I'm not including it
here. You can find it at:

https://github.com/beetbox/beets/releases/tag/v1.4.7

Originally I wanted to just fix the build, which is currently broken
because a few tests have failed, but the fix for the tests is already
included in the 1.4.7 upstream release[1], so I opted to update instead.

Other than running the tests included in beets (in addition to
building/running tests of the "alternatives" and "copyartifacts"
external plugins) I have made some small queries on my local music
collection, but haven't tested import or any write operation.

[1]: https://github.com/beetbox/beets/commit/8eb50fee33044dea008408423ee

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @domenkozar, @pjones
---
 pkgs/tools/audio/beets/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b53a9b7eb0f..b6ff7e5c967 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -17,6 +17,7 @@
 , enableLastfm         ? true
 , enableMpd            ? true
 , enableReplaygain     ? true, bs1770gain ? null
+, enableSonosUpdate    ? true
 , enableThumbnails     ? true
 , enableWeb            ? true
 
@@ -37,6 +38,7 @@ assert enableKeyfinder   -> keyfinder-cli != null;
 assert enableLastfm      -> pythonPackages.pylast         != null;
 assert enableMpd         -> pythonPackages.mpd2           != null;
 assert enableReplaygain  -> bs1770gain                    != null;
+assert enableSonosUpdate -> pythonPackages.soco           != null;
 assert enableThumbnails  -> pythonPackages.pyxdg          != null;
 assert enableWeb         -> pythonPackages.flask          != null;
 
@@ -59,6 +61,7 @@ let
     mpdstats = enableMpd;
     mpdupdate = enableMpd;
     replaygain = enableReplaygain;
+    sonosupdate = enableSonosUpdate;
     thumbnails = enableThumbnails;
     web = enableWeb;
   };
@@ -95,13 +98,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "0m8macydkn1fp4ymig0rg7bzw77rrm454q763gxdpq2kg08yl5py";
+    sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l";
   };
 
   propagatedBuildInputs = [
@@ -129,6 +132,7 @@ in pythonPackages.buildPythonApplication rec {
     ++ optional enableKeyfinder     keyfinder-cli
     ++ optional enableLastfm        pythonPackages.pylast
     ++ optional enableMpd           pythonPackages.mpd2
+    ++ optional enableSonosUpdate   pythonPackages.soco
     ++ optional enableThumbnails    pythonPackages.pyxdg
     ++ optional enableWeb           pythonPackages.flask
     ++ optional enableAlternatives  plugins.alternatives