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

Merge pull request #26959 from jfrankenau/beets-1.4.5

Browse Source 
beets: 1.4.3 -> 1.4.5
This commit is contained in:
Benno Fünfstück 2017-06-30 10:49:46 +02:00 committed by GitHub
commit 65d5515eac
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,9 @@
, enableDiscogs ? true , enableDiscogs ? true
, enableEmbyupdate ? true , enableEmbyupdate ? true
, enableFetchart ? true , enableFetchart ? true
, enableGmusic ? true
, enableKeyfinder ? true, keyfinder-cli ? null , enableKeyfinder ? true, keyfinder-cli ? null
, enableKodiupdate ? true
, enableLastfm ? true , enableLastfm ? true
, enableMpd ? true , enableMpd ? true
, enableReplaygain ? true, bs1770gain ? null , enableReplaygain ? true, bs1770gain ? null
@ -27,9 +29,10 @@ assert enableBadfiles -> flac != null && mp3val != null;
assert enableConvert -> ffmpeg != null; assert enableConvert -> ffmpeg != null;
assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableDiscogs -> pythonPackages.discogs_client != null;
assert enableFetchart -> pythonPackages.responses != null; assert enableFetchart -> pythonPackages.responses != null;
assert enableGmusic -> pythonPackages.gmusicapi != null;
assert enableKeyfinder -> keyfinder-cli != null; assert enableKeyfinder -> keyfinder-cli != null;
assert enableLastfm -> pythonPackages.pylast != null; assert enableLastfm -> pythonPackages.pylast != null;
assert enableMpd -> pythonPackages.mpd != null; assert enableMpd -> pythonPackages.mpd2 != null;
assert enableReplaygain -> bs1770gain != null; assert enableReplaygain -> bs1770gain != null;
assert enableThumbnails -> pythonPackages.pyxdg != null; assert enableThumbnails -> pythonPackages.pyxdg != null;
assert enableWeb -> pythonPackages.flask != null; assert enableWeb -> pythonPackages.flask != null;
@ -45,7 +48,9 @@ let
discogs = enableDiscogs; discogs = enableDiscogs;
embyupdate = enableEmbyupdate; embyupdate = enableEmbyupdate;
fetchart = enableFetchart; fetchart = enableFetchart;
gmusic = enableGmusic;
keyfinder = enableKeyfinder; keyfinder = enableKeyfinder;
kodiupdate = enableKodiupdate;
lastgenre = enableLastfm; lastgenre = enableLastfm;
lastimport = enableLastfm; lastimport = enableLastfm;
mpdstats = enableMpd; mpdstats = enableMpd;
@ -74,13 +79,13 @@ let
in pythonPackages.buildPythonApplication rec { in pythonPackages.buildPythonApplication rec {
name = "beets-${version}"; name = "beets-${version}";
version = "1.4.3"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "beetbox"; owner = "beetbox";
repo = "beets"; repo = "beets";
rev = "v${version}"; rev = "v${version}";
sha256 = "0sh2ap7jbqh7p8h63kgrx1ja9lyqlxjpfnh6axxw9p1mh78cgc1v"; sha256 = "0fvfp9ckq3dhs4f8abg9fprfppyf0g6mv8br2xz99plg4wnffzmy";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -99,13 +104,15 @@ in pythonPackages.buildPythonApplication rec {
] ++ optional enableAcoustid pythonPackages.pyacoustid ] ++ optional enableAcoustid pythonPackages.pyacoustid
++ optional (enableFetchart ++ optional (enableFetchart
|| enableEmbyupdate || enableEmbyupdate
|| enableKodiupdate
|| enableAcousticbrainz) || enableAcousticbrainz)
pythonPackages.requests pythonPackages.requests
++ optional enableConvert ffmpeg ++ optional enableConvert ffmpeg
++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableDiscogs pythonPackages.discogs_client
++ optional enableGmusic pythonPackages.gmusicapi
++ optional enableKeyfinder keyfinder-cli ++ optional enableKeyfinder keyfinder-cli
++ optional enableLastfm pythonPackages.pylast ++ optional enableLastfm pythonPackages.pylast
++ optional enableMpd pythonPackages.mpd ++ optional enableMpd pythonPackages.mpd2
++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableThumbnails pythonPackages.pyxdg
++ optional enableWeb pythonPackages.flask ++ optional enableWeb pythonPackages.flask
++ optional enableAlternatives (import ./alternatives-plugin.nix { ++ optional enableAlternatives (import ./alternatives-plugin.nix {
@ -146,7 +153,7 @@ in pythonPackages.buildPythonApplication rec {
s,"mp3val","${mp3val}/bin/mp3val", s,"mp3val","${mp3val}/bin/mp3val",
}' beetsplug/badfiles.py }' beetsplug/badfiles.py
'' + optionalString enableConvert '' '' + optionalString enableConvert ''
sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py
'' + optionalString enableReplaygain '' '' + optionalString enableReplaygain ''
sed -i -re ' sed -i -re '
s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2! s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2!