all: apply nixpkgs-fmt
This commit is contained in:
parent
46b331a413
commit
a70a0e914b
16
ci.nix
16
ci.nix
@ -9,7 +9,7 @@
|
||||
# then your CI will be able to build and cache only those packages for
|
||||
# which this is possible.
|
||||
|
||||
{ pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
|
||||
with builtins;
|
||||
|
||||
@ -29,10 +29,10 @@ let
|
||||
let
|
||||
f = p:
|
||||
if shouldRecurseForDerivations p then flattenPkgs p
|
||||
else if isDerivation p then [p]
|
||||
else [];
|
||||
else if isDerivation p then [ p ]
|
||||
else [ ];
|
||||
in
|
||||
concatMap f (attrValues s);
|
||||
concatMap f (attrValues s);
|
||||
|
||||
outputsOf = p: map (o: p.${o}) p.outputs;
|
||||
|
||||
@ -40,10 +40,10 @@ let
|
||||
|
||||
nurPkgs =
|
||||
flattenPkgs
|
||||
(listToAttrs
|
||||
(map (n: nameValuePair n nurAttrs.${n})
|
||||
(filter (n: !isReserved n)
|
||||
(attrNames nurAttrs))));
|
||||
(listToAttrs
|
||||
(map (n: nameValuePair n nurAttrs.${n})
|
||||
(filter (n: !isReserved n)
|
||||
(attrNames nurAttrs))));
|
||||
|
||||
in
|
||||
|
||||
|
@ -21,21 +21,25 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
generateCommon = lib.makeOverridable ({
|
||||
common ? ./manual-common-packages.nix
|
||||
}: let
|
||||
generateCommon = lib.makeOverridable (
|
||||
{ common ? ./manual-common-packages.nix
|
||||
}:
|
||||
let
|
||||
|
||||
imported = import common {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
imported = import common {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
|
||||
super = imported;
|
||||
super = imported;
|
||||
|
||||
overrides = { };
|
||||
overrides = { };
|
||||
|
||||
jetbrainsPlugins = super // overrides;
|
||||
jetbrainsPlugins = super // overrides;
|
||||
|
||||
in jetbrainsPlugins // { inherit commonBuild; });
|
||||
in
|
||||
jetbrainsPlugins // { inherit commonBuild; }
|
||||
);
|
||||
|
||||
in generateCommon { }
|
||||
in
|
||||
generateCommon { }
|
||||
|
||||
|
@ -9,21 +9,25 @@ let
|
||||
jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
|
||||
};
|
||||
|
||||
generateIdea = lib.makeOverridable ({
|
||||
idea ? ./manual-idea-packages.nix
|
||||
}: let
|
||||
generateIdea = lib.makeOverridable (
|
||||
{ idea ? ./manual-idea-packages.nix
|
||||
}:
|
||||
let
|
||||
|
||||
imported = import idea {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
imported = import idea {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
|
||||
super = imported;
|
||||
super = imported;
|
||||
|
||||
overrides = { };
|
||||
overrides = { };
|
||||
|
||||
ideaPlugins = super // overrides;
|
||||
ideaPlugins = super // overrides;
|
||||
|
||||
in ideaPlugins // { inherit ideaBuild; });
|
||||
in
|
||||
ideaPlugins // { inherit ideaBuild; }
|
||||
);
|
||||
|
||||
in generateIdea { }
|
||||
in
|
||||
generateIdea { }
|
||||
|
||||
|
@ -5,20 +5,27 @@
|
||||
, python3Packages
|
||||
, lame
|
||||
|
||||
, aacSupport ? false, faac
|
||||
, alacSupport ? false, libav
|
||||
, flacSupport ? false, flac
|
||||
, m4aSupport ? false, mp4Support ? false, fdk-aac-encoder
|
||||
, oggSupport ? false, vorbisTools
|
||||
, opusSupport ? false, opusTools
|
||||
, aacSupport ? false
|
||||
, faac
|
||||
, alacSupport ? false
|
||||
, libav
|
||||
, flacSupport ? false
|
||||
, flac
|
||||
, m4aSupport ? false
|
||||
, mp4Support ? false
|
||||
, fdk-aac-encoder
|
||||
, oggSupport ? false
|
||||
, vorbisTools
|
||||
, opusSupport ? false
|
||||
, opusTools
|
||||
}:
|
||||
|
||||
assert aacSupport -> faac.meta.available;
|
||||
assert alacSupport -> libav.meta.available;
|
||||
assert flacSupport -> flac.meta.available;
|
||||
assert aacSupport -> faac.meta.available;
|
||||
assert alacSupport -> libav.meta.available;
|
||||
assert flacSupport -> flac.meta.available;
|
||||
assert m4aSupport || mp4Support -> fdk-aac-encoder.meta.available;
|
||||
assert oggSupport -> vorbisTools.meta.available;
|
||||
assert opusSupport -> opusTools.meta.available;
|
||||
assert oggSupport -> vorbisTools.meta.available;
|
||||
assert opusSupport -> opusTools.meta.available;
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "spotify-ripper";
|
||||
|
@ -3,7 +3,8 @@
|
||||
, fetchFromGitHub
|
||||
|
||||
, python3
|
||||
, ffmpeg }:
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ytarchive";
|
||||
|
@ -20,14 +20,16 @@ let
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
in lib.makeScope newScope (self: lib.makeOverridable ({
|
||||
jetbrainsPlugins ? mkJetbrainsPlugins self
|
||||
, ideaPlugins ? mkIdeaPlugins self
|
||||
}: ({ }
|
||||
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
|
||||
// ideaPlugins // { inherit ideaPlugins; }
|
||||
// {
|
||||
in
|
||||
lib.makeScope newScope (self: lib.makeOverridable
|
||||
({ jetbrainsPlugins ? mkJetbrainsPlugins self
|
||||
, ideaPlugins ? mkIdeaPlugins self
|
||||
}: ({ }
|
||||
// jetbrainsPlugins // { inherit jetbrainsPlugins; }
|
||||
// ideaPlugins // { inherit ideaPlugins; }
|
||||
// {
|
||||
inherit variant;
|
||||
jetbrainsWithPlugins = jetbrainsWithPlugins self variant;
|
||||
})
|
||||
) { })
|
||||
)
|
||||
{ })
|
||||
|
Loading…
Reference in New Issue
Block a user