summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-06-04 23:59:14 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-06-04 23:59:14 -0700
commit04f0ab105c7ed4d7198b2259404ef7de003a74de (patch)
tree9b2fcf7a3f984c835a670c45d12170e3546da786 /pkgs/tools
parenta84e6336bd185238d47ea94895660d49149559d5 (diff)
parentdd6946dcbba7e5501c2d7ac4f89641520c137d1e (diff)
downloadnixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar.gz
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar.bz2
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar.lz
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar.xz
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.tar.zst
nixlib-04f0ab105c7ed4d7198b2259404ef7de003a74de.zip
Merge pull request #8105 from codyopel/beets
Updated Beets and dependenecies
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/audio/beets/default.nix23
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index dc859b497367..0af0b427bf23 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/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 ];
   };
 }