forked from github-mirror/docker-nixpkgs
nixpkgs-fmt
This commit is contained in:
@@ -12,15 +12,19 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# gitMinimal still ships with perl and python
|
# gitMinimal still ships with perl and python
|
||||||
gitReallyMinimal = (git.override {
|
gitReallyMinimal = (
|
||||||
|
git.override {
|
||||||
perlSupport = false;
|
perlSupport = false;
|
||||||
pythonSupport = false;
|
pythonSupport = false;
|
||||||
withManual = false;
|
withManual = false;
|
||||||
withpcre2 = false;
|
withpcre2 = false;
|
||||||
}).overrideAttrs(_:{
|
}
|
||||||
|
).overrideAttrs (
|
||||||
|
_: {
|
||||||
# installCheck is broken when perl is disabled
|
# installCheck is broken when perl is disabled
|
||||||
doInstallCheck = false;
|
doInstallCheck = false;
|
||||||
});
|
}
|
||||||
|
);
|
||||||
|
|
||||||
image = dockerTools.buildImageWithNixDb {
|
image = dockerTools.buildImageWithNixDb {
|
||||||
inherit (nix) name;
|
inherit (nix) name;
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ importFn: baseDir:
|
|||||||
let
|
let
|
||||||
dirEntries =
|
dirEntries =
|
||||||
builtins.attrNames
|
builtins.attrNames
|
||||||
(lib.filterAttrs
|
(
|
||||||
|
lib.filterAttrs
|
||||||
(k: v: v == "directory")
|
(k: v: v == "directory")
|
||||||
(builtins.readDir baseDir));
|
(builtins.readDir baseDir)
|
||||||
|
);
|
||||||
|
|
||||||
absDirs =
|
absDirs =
|
||||||
builtins.map
|
builtins.map
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ _: pkgs: let
|
|||||||
importDir = import ./lib/importDir.nix {
|
importDir = import ./lib/importDir.nix {
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
# builder stuff can be in the top-level
|
# builder stuff can be in the top-level
|
||||||
buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};
|
buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user