Merge pull request #8105 from codyopel/beets

Updated Beets and dependenecies

pkgs/tools/audio/beets/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
-, buildPythonPackage, pythonPackages, python
+, buildPythonPackage, pythonPackages, python, imagemagick
 
 , enableAcoustid   ? true
 , enableDiscogs    ? true
@@ -45,8 +45,9 @@ let
     "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
     "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
-    "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random"
-    "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero"
+    "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
+    "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
+    "types" "zero"
   ];
 
   enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -59,18 +60,19 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.11";
+  version = "1.3.13";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m";
+    sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl";
   };
 
   propagatedBuildInputs = [
     pythonPackages.enum34
+    pythonPackages.jellyfish
     pythonPackages.munkres
     pythonPackages.musicbrainzngs
     pythonPackages.mutagen
@@ -91,13 +93,10 @@ in buildPythonPackage rec {
 
   buildInputs = with pythonPackages; [
     beautifulsoup4
-    flask
+    imagemagick
     mock
     nose
-    pyechonest
-    pylast
     rarfile
-    requests2
     responses
   ];
 
@@ -165,9 +164,9 @@ in buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = http://beets.radbox.org;
     description = "Music tagger and library organizer";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ];
+    homepage = http://beets.radbox.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ aszlig iElectric pjones ];
   };
 }

pkgs/top-level/python-packages.nix

@@ -1057,17 +1057,17 @@ let
   };
 
   responses = self.buildPythonPackage rec {
-    name = "responses-0.2.2";
-
-    propagatedBuildInputs = with self; [ requests mock six pytest flake8 ];
-
-    doCheck = false;
+    name = "responses-0.4.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/r/responses/responses-0.2.2.tar.gz";
-      md5 = "5d79fd425cf8d858dfc8afa6475395d3";
+      url = "https://pypi.python.org/packages/source/r/responses/${name}.tar.gz";
+      sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5";
     };
 
+    propagatedBuildInputs = with self; [ cookies mock requests2 six ];
+
+    doCheck = false;
+
   };
 
   rarfile = self.buildPythonPackage rec {
@@ -2008,6 +2008,23 @@ let
     };
   };
 
+  cookies = buildPythonPackage rec {
+    name = "cookies-2.2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/cookies/${name}.tar.gz";
+      sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Friendlier RFC 6265-compliant cookie parser/renderer";
+      homepage = https://github.com/sashahart/cookies;
+      license = licenses.mit;
+    };
+  };
+
   coverage = buildPythonPackage rec {
     name = "coverage-3.7.1";
 
@@ -10620,16 +10637,17 @@ let
 
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
-    version = "2.6.0";
+    version = "2.7.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
-      sha256 = "0xadnw27m257scrhjcc66zm4z3ikg8n9h6g9akpkavr31qgyvnqw";
+      sha256 = "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir";
     };
 
     meta = {
       description = "An Apache2 licensed HTTP library, written in Python, for human beings";
       homepage = http://docs.python-requests.org/en/latest/;
+      license = licenses.asl20;
     };
   };