JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12769 from Profpatsch/beets

Browse Source 
Updates beets to version 1.3.16, which comes with new plugins
"embyupdate", "edit" and "mbsubmit". See the following URL for a
detailed upstream changelog:

http://beets.readthedocs.org/en/v1.3.16/changelog.html

The "mbsubmit" plugin isn't listed there and made it more or less
silently into the release, see beetbox/beets#1779 for the final work on
the plugin.

Tested this locally with a few queries and using the new "edit" plugin.
This commit is contained in:
aszlig 2016-02-03 14:19:35 +01:00
commit ac9cea30fb
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/audio/beets/default.nix
View File

@ -5,6 +5,7 @@
, enableBadfiles ? true, flac ? null, mp3val ? null , enableBadfiles ? true, flac ? null, mp3val ? null
, enableDiscogs ? true , enableDiscogs ? true
, enableEchonest ? true , enableEchonest ? true
, enableEmbyupdate ? true
, enableFetchart ? true , enableFetchart ? true
, enableLastfm ? true , enableLastfm ? true
, enableMpd ? true , enableMpd ? true
@ -37,6 +38,7 @@ let
chroma = enableAcoustid; chroma = enableAcoustid;
discogs = enableDiscogs; discogs = enableDiscogs;
echonest = enableEchonest; echonest = enableEchonest;
embyupdate = enableEmbyupdate;
fetchart = enableFetchart; fetchart = enableFetchart;
lastgenre = enableLastfm; lastgenre = enableLastfm;
lastimport = enableLastfm; lastimport = enableLastfm;
@ -48,10 +50,10 @@ let
}; };
pluginsWithoutDeps = [ pluginsWithoutDeps = [
"bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "edit" "embedart"
"filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
"importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
"mbcollection" "mbsync" "metasync" "missing" "permissions" "play" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
"plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
"types" "zero" "types" "zero"
]; ];
@ -66,14 +68,14 @@ let
in buildPythonPackage rec { in buildPythonPackage rec {
name = "beets-${version}"; name = "beets-${version}";
version = "1.3.15"; version = "1.3.16";
namePrefix = ""; namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sampsyo"; owner = "sampsyo";
repo = "beets"; repo = "beets";
rev = "v${version}"; rev = "v${version}";
sha256 = "17mbkilqqkxxa8ra8b4zlsax712jb0nfkvcx9iyq9303rqwv5sx2"; sha256 = "1grjcgr419yq756wwxjpzyfjdf8n51bg6i0agm465lb7l3jgqy6k";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -87,14 +89,15 @@ in buildPythonPackage rec {
pythonPackages.unidecode pythonPackages.unidecode
python.modules.sqlite3 python.modules.sqlite3
python.modules.readline python.modules.readline
] ++ optional enableAcoustid pythonPackages.pyacoustid ] ++ optional enableAcoustid pythonPackages.pyacoustid
++ optional enableFetchart pythonPackages.requests2 ++ optional (enableFetchart
++ optional enableDiscogs pythonPackages.discogs_client || enableEmbyupdate) pythonPackages.requests2
++ optional enableEchonest pythonPackages.pyechonest ++ optional enableDiscogs pythonPackages.discogs_client
++ optional enableLastfm pythonPackages.pylast ++ optional enableEchonest pythonPackages.pyechonest
++ optional enableMpd pythonPackages.mpd ++ optional enableLastfm pythonPackages.pylast
++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableMpd pythonPackages.mpd
++ optional enableWeb pythonPackages.flask ++ optional enableThumbnails pythonPackages.pyxdg
++ optional enableWeb pythonPackages.flask
++ optional enableAlternatives (import ./alternatives-plugin.nix { ++ optional enableAlternatives (import ./alternatives-plugin.nix {
inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub; inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub;
}); });
@ -186,7 +189,7 @@ in buildPythonPackage rec {
description = "Music tagger and library organizer"; description = "Music tagger and library organizer";
homepage = http://beets.radbox.org; homepage = http://beets.radbox.org;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ aszlig iElectric pjones ]; maintainers = with maintainers; [ aszlig iElectric pjones profpatsch ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }