@@ -1,24 +1,23 @@
1{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
1{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
2, pythonPackages, imagemagick, gobject-introspection, gst_all_1
2, pythonPackages, imagemagick, gobject-introspection, gst_all_1
4−, unstableGitUpdater
3+, runtimeShell, unstableGitUpdater
6# external plugins package set
5# external plugins package set
7, beetsExternalPlugins
6, beetsExternalPlugins
9−, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
8+, enableAbsubmit ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
10, enableAcousticbrainz ? true
9, enableAcousticbrainz ? true
11, enableAcoustid ? true
10, enableAcoustid ? true
12−, enableBadfiles ? true, flac ? null, mp3val ? null
11+, enableBadfiles ? true, flac, mp3val
13, enableBeatport ? true
12, enableBeatport ? true
14, enableBpsync ? true
13, enableBpsync ? true
15−, enableConvert ? true, ffmpeg ? null
14+, enableConvert ? true, ffmpeg
16, enableDeezer ? true
15, enableDeezer ? true
17, enableDiscogs ? true
16, enableDiscogs ? true
18, enableEmbyupdate ? true
17, enableEmbyupdate ? true
19, enableFetchart ? true
18, enableFetchart ? true
20, enableGmusic ? true
19, enableGmusic ? true
21−, enableKeyfinder ? true, keyfinder-cli ? null
20+, enableKeyfinder ? true, keyfinder-cli
22, enableKodiupdate ? true
21, enableKodiupdate ? true
23, enableLastfm ? true
22, enableLastfm ? true
24, enableLoadext ? true
23, enableLoadext ? true
@@ -33,32 +32,14 @@
34# External plugins
33# External plugins
35, enableAlternatives ? false
34, enableAlternatives ? false
36−, enableCheck ? false, liboggz ? null
35+, enableCheck ? false, liboggz
37, enableCopyArtifacts ? false
36, enableCopyArtifacts ? false
38, enableExtraFiles ? false
37, enableExtraFiles ? false
40, bashInteractive, bash-completion
39, bashInteractive, bash-completion
43−assert enableAbsubmit -> essentia-extractor != null;
44−assert enableAcoustid -> pythonPackages.pyacoustid != null;
45−assert enableBadfiles -> flac != null && mp3val != null;
46−assert enableBeatport -> pythonPackages.requests_oauthlib != null;
47assert enableBpsync -> enableBeatport;
42assert enableBpsync -> enableBeatport;
48−assert enableCheck -> flac != null && mp3val != null && liboggz != null;
49−assert enableConvert -> ffmpeg != null;
50−assert enableDiscogs -> pythonPackages.discogs_client != null;
51−assert enableFetchart -> pythonPackages.responses != null;
52−assert enableGmusic -> pythonPackages.gmusicapi != null;
53−assert enableKeyfinder -> keyfinder-cli != null;
54−assert enableLastfm -> pythonPackages.pylast != null;
55−assert enableMpd -> pythonPackages.mpd2 != null;
56−assert enableReplaygain -> ffmpeg != null;
57−assert enableSonosUpdate -> pythonPackages.soco != null;
58−assert enableThumbnails -> pythonPackages.pyxdg != null;
59−assert enableWeb -> pythonPackages.flask != null;
64 optionalPlugins = {
45 optionalPlugins = {
@@ -99,20 +80,20 @@ let
99 "types" "unimported" "zero"
80 "types" "unimported" "zero"
102− enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
83+ enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
104− allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
85+ allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
105 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
86 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
107 testShell = "${bashInteractive}/bin/bash --norc";
88 testShell = "${bashInteractive}/bin/bash --norc";
108 completion = "${bash-completion}/share/bash-completion/bash_completion";
89 completion = "${bash-completion}/share/bash-completion/bash_completion";
110 # This is a stripped down beets for testing of the external plugins.
91 # This is a stripped down beets for testing of the external plugins.
111− externalTestArgs.beets = (beets.override {
92+ externalTestArgs.beets = (lib.beets.override {
112 enableAlternatives = false;
93 enableAlternatives = false;
113 enableCopyArtifacts = false;
94 enableCopyArtifacts = false;
114 enableExtraFiles = false;
95 enableExtraFiles = false;
115− }).overrideAttrs (const {
96+ }).overrideAttrs (lib.const {
116 doInstallCheck = false;
97 doInstallCheck = false;
@@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
147 pythonPackages.confuse
128 pythonPackages.confuse
148 pythonPackages.mediafile
129 pythonPackages.mediafile
149 gobject-introspection
130 gobject-introspection
150− ] ++ optional enableAbsubmit essentia-extractor
131+ ] ++ lib.optional enableAbsubmit essentia-extractor
151− ++ optional enableAcoustid pythonPackages.pyacoustid
132+ ++ lib.optional enableAcoustid pythonPackages.pyacoustid
152− ++ optional enableBeatport pythonPackages.requests_oauthlib
133+ ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
153− ++ optional (enableFetchart
134+ ++ lib.optional (enableFetchart
154 || enableDeezer
135 || enableDeezer
155 || enableEmbyupdate
136 || enableEmbyupdate
156 || enableKodiupdate
137 || enableKodiupdate
@@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
160 || enableSubsonicupdate
141 || enableSubsonicupdate
161 || enableAcousticbrainz)
142 || enableAcousticbrainz)
162 pythonPackages.requests
143 pythonPackages.requests
163− ++ optional enableCheck beetsExternalPlugins.check
144+ ++ lib.optional enableCheck beetsExternalPlugins.check
164− ++ optional enableConvert ffmpeg
145+ ++ lib.optional enableConvert ffmpeg
165− ++ optional enableDiscogs pythonPackages.discogs_client
146+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
166− ++ optional enableGmusic pythonPackages.gmusicapi
147+ ++ lib.optional enableGmusic pythonPackages.gmusicapi
167− ++ optional enableKeyfinder keyfinder-cli
148+ ++ lib.optional enableKeyfinder keyfinder-cli
168− ++ optional enableLastfm pythonPackages.pylast
149+ ++ lib.optional enableLastfm pythonPackages.pylast
169− ++ optional enableMpd pythonPackages.mpd2
150+ ++ lib.optional enableMpd pythonPackages.mpd2
170− ++ optional enableSonosUpdate pythonPackages.soco
151+ ++ lib.optional enableSonosUpdate pythonPackages.soco
171− ++ optional enableThumbnails pythonPackages.pyxdg
152+ ++ lib.optional enableThumbnails pythonPackages.pyxdg
172− ++ optional enableWeb pythonPackages.flask
153+ ++ lib.optional enableWeb pythonPackages.flask
173− ++ optional enableAlternatives beetsExternalPlugins.alternatives
154+ ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
174− ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
155+ ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
175− ++ optional enableExtraFiles beetsExternalPlugins.extrafiles
156+ ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
178 buildInputs = [
159 buildInputs = [
@@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
209 # bs1770gain, and set the absolute path there, to avoid impurities.
190 # bs1770gain, and set the absolute path there, to avoid impurities.
210 ++ lib.optional enableReplaygain (substituteAll {
191 ++ lib.optional enableReplaygain (substituteAll {
211 src = ./replaygain-default-ffmpeg.patch;
192 src = ./replaygain-default-ffmpeg.patch;
212− ffmpeg = getBin ffmpeg;
193+ ffmpeg = lib.getBin ffmpeg;
214 # Put absolute Nix paths in place
195 # Put absolute Nix paths in place
215 ++ lib.optional enableConvert (substituteAll {
196 ++ lib.optional enableConvert (substituteAll {
216 src = ./convert-plugin-ffmpeg-path.patch;
197 src = ./convert-plugin-ffmpeg-path.patch;
217− ffmpeg = getBin ffmpeg;
198+ ffmpeg = lib.getBin ffmpeg;
219 ++ lib.optional enableBadfiles (substituteAll {
200 ++ lib.optional enableBadfiles (substituteAll {
220 src = ./badfiles-plugin-nix-paths.patch;
201 src = ./badfiles-plugin-nix-paths.patch;
@@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
269 EDITOR="${writeScript "beetconfig.sh" ''
250 EDITOR="${writeScript "beetconfig.sh" ''
270 #!${runtimeShell}
251 #!${runtimeShell}
271 cat > "$1" <<CFG
252 cat > "$1" <<CFG
272− plugins: ${concatStringsSep " " allEnabledPlugins}
253+ plugins: ${lib.concatStringsSep " " allEnabledPlugins}
274 ''}" HOME="$tmphome" "$out/bin/beet" config -e
255 ''}" HOME="$tmphome" "$out/bin/beet" config -e
275 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
256 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
@@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
285 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
266 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
288− meta = {
269+ meta = with lib; {
289 description = "Music tagger and library organizer";
270 description = "Music tagger and library organizer";
290 homepage = "http://beets.io";
271 homepage = "http://beets.io";
291 license = licenses.mit;
272 license = licenses.mit;