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

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

View file

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

View file

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