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