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
|
if docker-compose == null
|
||||||
then python3Packages.docker_compose
|
then python3Packages.docker_compose
|
||||||
else docker-compose # nixos 19.03+
|
else docker-compose # nixos 19.03+
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -64,4 +68,4 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
image // { meta = nix.meta // image.meta; }
|
image // { meta = nix.meta // image.meta; }
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
, cacert
|
, cacert
|
||||||
}:
|
}:
|
||||||
{ drv # derivation to build the image for
|
{ 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
|
, binName ? (builtins.parseDrvName drv.name).name
|
||||||
, meta ? drv.meta
|
, meta ? drv.meta
|
||||||
}:
|
}:
|
||||||
|
@ -33,4 +33,4 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
image // { meta = meta // image.meta; }
|
image // { meta = meta // image.meta; }
|
||||||
|
|
|
@ -4,9 +4,11 @@ importFn: baseDir:
|
||||||
let
|
let
|
||||||
dirEntries =
|
dirEntries =
|
||||||
builtins.attrNames
|
builtins.attrNames
|
||||||
(lib.filterAttrs
|
(
|
||||||
(k: v: v == "directory")
|
lib.filterAttrs
|
||||||
(builtins.readDir baseDir));
|
(k: v: v == "directory")
|
||||||
|
(builtins.readDir baseDir)
|
||||||
|
);
|
||||||
|
|
||||||
absDirs =
|
absDirs =
|
||||||
builtins.map
|
builtins.map
|
||||||
|
@ -18,4 +20,4 @@ let
|
||||||
(dir: { name = builtins.baseNameOf dir; value = importFn dir; })
|
(dir: { name = builtins.baseNameOf dir; value = importFn dir; })
|
||||||
absDirs;
|
absDirs;
|
||||||
in
|
in
|
||||||
builtins.listToAttrs imports
|
builtins.listToAttrs imports
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
_: pkgs: let
|
_: 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 {};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
let
|
let
|
||||||
pkgs = import ./. {};
|
pkgs = import ./. {};
|
||||||
in
|
in
|
||||||
pkgs.docker-nixpkgs
|
pkgs.docker-nixpkgs
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue