git.iko.soy/typeable/nixpkgs
on master help sign in
beets: remove ``? null``; remove ``with lib``
commit3353bf7a165d5c520d31f2b62f165b605910e512 authorSandro Jäckel <sandro.jaeckel@gmail.com> dateSat 6 Mar 2021, 19:17 (6 years ago) parent901206a
1 file changed+31−50
pkgs/tools/audio/beets/default.nix+31−50
pkgs/tools/audio/beets/default.nix+31−50
@@ -1,24 +1,23 @@
11{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
22, pythonPackages, imagemagick, gobject-introspection, gst_all_1
3−, runtimeShell
4−, unstableGitUpdater
3+, runtimeShell, unstableGitUpdater
54
65# external plugins package set
76, beetsExternalPlugins
87
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
109, enableAcousticbrainz ? true
1110, enableAcoustid ? true
12−, enableBadfiles ? true, flac ? null, mp3val ? null
11+, enableBadfiles ? true, flac, mp3val
1312, enableBeatport ? true
1413, enableBpsync ? true
15−, enableConvert ? true, ffmpeg ? null
14+, enableConvert ? true, ffmpeg
1615, enableDeezer ? true
1716, enableDiscogs ? true
1817, enableEmbyupdate ? true
1918, enableFetchart ? true
2019, enableGmusic ? true
21−, enableKeyfinder ? true, keyfinder-cli ? null
20+, enableKeyfinder ? true, keyfinder-cli
2221, enableKodiupdate ? true
2322, enableLastfm ? true
2423, enableLoadext ? true
@@ -33,32 +32,14 @@
3332
3433# External plugins
3534, enableAlternatives ? false
36−, enableCheck ? false, liboggz ? null
35+, enableCheck ? false, liboggz
3736, enableCopyArtifacts ? false
3837, enableExtraFiles ? false
3938
4039, bashInteractive, bash-completion
4140}:
4241
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;
4742assert 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;
60−
61−with lib;
6243
6344let
6445 optionalPlugins = {
@@ -99,20 +80,20 @@ let
9980 "types" "unimported" "zero"
10081 ];
10182
102− enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
83+ enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
10384
104− allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
85+ allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
10586 allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
10687
10788 testShell = "${bashInteractive}/bin/bash --norc";
10889 completion = "${bash-completion}/share/bash-completion/bash_completion";
10990
11091 # This is a stripped down beets for testing of the external plugins.
111− externalTestArgs.beets = (beets.override {
92+ externalTestArgs.beets = (lib.beets.override {
11293 enableAlternatives = false;
11394 enableCopyArtifacts = false;
11495 enableExtraFiles = false;
115− }).overrideAttrs (const {
96+ }).overrideAttrs (lib.const {
11697 doInstallCheck = false;
11798 });
11899
@@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
147128 pythonPackages.confuse
148129 pythonPackages.mediafile
149130 gobject-introspection
150− ] ++ optional enableAbsubmit essentia-extractor
151− ++ optional enableAcoustid pythonPackages.pyacoustid
152− ++ optional enableBeatport pythonPackages.requests_oauthlib
153− ++ optional (enableFetchart
131+ ] ++ lib.optional enableAbsubmit essentia-extractor
132+ ++ lib.optional enableAcoustid pythonPackages.pyacoustid
133+ ++ lib.optional enableBeatport pythonPackages.requests_oauthlib
134+ ++ lib.optional (enableFetchart
154135 || enableDeezer
155136 || enableEmbyupdate
156137 || enableKodiupdate
@@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
160141 || enableSubsonicupdate
161142 || enableAcousticbrainz)
162143 pythonPackages.requests
163− ++ optional enableCheck beetsExternalPlugins.check
164− ++ optional enableConvert ffmpeg
165− ++ optional enableDiscogs pythonPackages.discogs_client
166− ++ optional enableGmusic pythonPackages.gmusicapi
167− ++ optional enableKeyfinder keyfinder-cli
168− ++ optional enableLastfm pythonPackages.pylast
169− ++ optional enableMpd pythonPackages.mpd2
170− ++ optional enableSonosUpdate pythonPackages.soco
171− ++ optional enableThumbnails pythonPackages.pyxdg
172− ++ optional enableWeb pythonPackages.flask
173− ++ optional enableAlternatives beetsExternalPlugins.alternatives
174− ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
175− ++ optional enableExtraFiles beetsExternalPlugins.extrafiles
144+ ++ lib.optional enableCheck beetsExternalPlugins.check
145+ ++ lib.optional enableConvert ffmpeg
146+ ++ lib.optional enableDiscogs pythonPackages.discogs_client
147+ ++ lib.optional enableGmusic pythonPackages.gmusicapi
148+ ++ lib.optional enableKeyfinder keyfinder-cli
149+ ++ lib.optional enableLastfm pythonPackages.pylast
150+ ++ lib.optional enableMpd pythonPackages.mpd2
151+ ++ lib.optional enableSonosUpdate pythonPackages.soco
152+ ++ lib.optional enableThumbnails pythonPackages.pyxdg
153+ ++ lib.optional enableWeb pythonPackages.flask
154+ ++ lib.optional enableAlternatives beetsExternalPlugins.alternatives
155+ ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
156+ ++ lib.optional enableExtraFiles beetsExternalPlugins.extrafiles
176157 ;
177158
178159 buildInputs = [
@@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
209190 # bs1770gain, and set the absolute path there, to avoid impurities.
210191 ++ lib.optional enableReplaygain (substituteAll {
211192 src = ./replaygain-default-ffmpeg.patch;
212− ffmpeg = getBin ffmpeg;
193+ ffmpeg = lib.getBin ffmpeg;
213194 })
214195 # Put absolute Nix paths in place
215196 ++ lib.optional enableConvert (substituteAll {
216197 src = ./convert-plugin-ffmpeg-path.patch;
217− ffmpeg = getBin ffmpeg;
198+ ffmpeg = lib.getBin ffmpeg;
218199 })
219200 ++ lib.optional enableBadfiles (substituteAll {
220201 src = ./badfiles-plugin-nix-paths.patch;
@@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
269250 EDITOR="${writeScript "beetconfig.sh" ''
270251 #!${runtimeShell}
271252 cat > "$1" <<CFG
272− plugins: ${concatStringsSep " " allEnabledPlugins}
253+ plugins: ${lib.concatStringsSep " " allEnabledPlugins}
273254 CFG
274255 ''}" HOME="$tmphome" "$out/bin/beet" config -e
275256 EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
@@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
285266 updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
286267 };
287268
288− meta = {
269+ meta = with lib; {
289270 description = "Music tagger and library organizer";
290271 homepage = "http://beets.io";
291272 license = licenses.mit;