nixpkgs-fmt

This commit is contained in:
zimbatm 2019-12-15 15:20:42 +01:00
parent 77f9b50c78
commit 39694ed1d8
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
6 changed files with 22 additions and 15 deletions

View file

@ -7,5 +7,5 @@ buildCLIImage {
if docker-compose == null
then python3Packages.docker_compose
else docker-compose # nixos 19.03+
;
;
}

View file

@ -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; }

View file

@ -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; }

View file

@ -4,9 +4,11 @@ importFn: baseDir:
let
dirEntries =
builtins.attrNames
(lib.filterAttrs
(k: v: v == "directory")
(builtins.readDir baseDir));
(
lib.filterAttrs
(k: v: v == "directory")
(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

View file

@ -1,8 +1,9 @@
_: pkgs: let
importDir = import ./lib/importDir.nix {
inherit (pkgs) lib;
inherit (pkgs) lib;
};
in {
in
{
# builder stuff can be in the top-level
buildCLIImage = pkgs.callPackage ./lib/buildCLIImage.nix {};

View file

@ -1,4 +1,4 @@
let
pkgs = import ./. {};
in
pkgs.docker-nixpkgs
pkgs.docker-nixpkgs