nixpkgs-fmt
This commit is contained in:
parent
77f9b50c78
commit
39694ed1d8
6 changed files with 22 additions and 15 deletions
|
@ -7,5 +7,5 @@ buildCLIImage {
|
|||
if docker-compose == null
|
||||
then python3Packages.docker_compose
|
||||
else docker-compose # nixos 19.03+
|
||||
;
|
||||
;
|
||||
}
|
||||
|
|
|
@ -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; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue