nixpkgs-fmt
This commit is contained in:
parent
77f9b50c78
commit
39694ed1d8
6 changed files with 22 additions and 15 deletions
|
@ -12,15 +12,19 @@
|
|||
}:
|
||||
let
|
||||
# gitMinimal still ships with perl and python
|
||||
gitReallyMinimal = (git.override {
|
||||
gitReallyMinimal = (
|
||||
git.override {
|
||||
perlSupport = false;
|
||||
pythonSupport = false;
|
||||
withManual = false;
|
||||
withpcre2 = false;
|
||||
}).overrideAttrs(_:{
|
||||
}
|
||||
).overrideAttrs (
|
||||
_: {
|
||||
# installCheck is broken when perl is disabled
|
||||
doInstallCheck=false;
|
||||
});
|
||||
doInstallCheck = false;
|
||||
}
|
||||
);
|
||||
|
||||
image = dockerTools.buildImageWithNixDb {
|
||||
inherit (nix) name;
|
||||
|
@ -64,4 +68,4 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
image // { meta = nix.meta // image.meta; }
|
||||
image // { meta = nix.meta // image.meta; }
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, cacert
|
||||
}:
|
||||
{ drv # derivation to build the image for
|
||||
# Name of the binary to run by default
|
||||
# Name of the binary to run by default
|
||||
, binName ? (builtins.parseDrvName drv.name).name
|
||||
, meta ? drv.meta
|
||||
}:
|
||||
|
@ -33,4 +33,4 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
image // { meta = meta // image.meta; }
|
||||
image // { meta = meta // image.meta; }
|
||||
|
|
|
@ -4,9 +4,11 @@ importFn: baseDir:
|
|||
let
|
||||
dirEntries =
|
||||
builtins.attrNames
|
||||
(lib.filterAttrs
|
||||
(
|
||||
lib.filterAttrs
|
||||
(k: v: v == "directory")
|
||||
(builtins.readDir baseDir));
|
||||
(builtins.readDir baseDir)
|
||||
);
|
||||
|
||||
absDirs =
|
||||
builtins.map
|
||||
|
@ -18,4 +20,4 @@ let
|
|||
(dir: { name = builtins.baseNameOf dir; value = importFn dir; })
|
||||
absDirs;
|
||||
in
|
||||
builtins.listToAttrs imports
|
||||
builtins.listToAttrs imports
|
||||
|
|
|
@ -2,7 +2,8 @@ _: pkgs: let
|
|||
importDir = import ./lib/importDir.nix {
|
||||
inherit (pkgs) lib;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
# builder stuff can be in the top-level
|
||||
buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
let
|
||||
pkgs = import ./. {};
|
||||
in
|
||||
pkgs.docker-nixpkgs
|
||||
pkgs.docker-nixpkgs
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue