diff --git a/images/docker-compose/default.nix b/images/docker-compose/default.nix index 1ca1665..fb673da 100644 --- a/images/docker-compose/default.nix +++ b/images/docker-compose/default.nix @@ -7,5 +7,5 @@ buildCLIImage { if docker-compose == null then python3Packages.docker_compose else docker-compose # nixos 19.03+ - ; + ; } diff --git a/images/nix/default.nix b/images/nix/default.nix index ed544d3..e1a6154 100644 --- a/images/nix/default.nix +++ b/images/nix/default.nix @@ -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; } diff --git a/lib/buildCLIImage.nix b/lib/buildCLIImage.nix index 9452496..17c479c 100644 --- a/lib/buildCLIImage.nix +++ b/lib/buildCLIImage.nix @@ -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; } diff --git a/lib/importDir.nix b/lib/importDir.nix index 0038a0a..88e3dcd 100644 --- a/lib/importDir.nix +++ b/lib/importDir.nix @@ -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 diff --git a/overlay.nix b/overlay.nix index 69dec46..3eff36b 100644 --- a/overlay.nix +++ b/overlay.nix @@ -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 {}; diff --git a/release.nix b/release.nix index 34c4529..bacbcd3 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ let pkgs = import ./. {}; in - pkgs.docker-nixpkgs +pkgs.docker-nixpkgs