diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-15 07:58:52 +0000 |
commit | 9d1daa60832979d5d361dfdac136fb9e5a1af2c5 (patch) | |
tree | 5192dd85903cb092cf7dff0e3403387b3b683d84 /nixpkgs/pkgs/build-support/docker/default.nix | |
parent | 67cdfc7d42f721bf85814af5a0095fb9f9ea455d (diff) | |
parent | f2ea252d23ebc9a5336bf6a61e0644921f64e67c (diff) | |
download | nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.gz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.bz2 nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.lz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.xz nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.tar.zst nixlib-9d1daa60832979d5d361dfdac136fb9e5a1af2c5.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/build-support/docker/default.nix')
-rw-r--r-- | nixpkgs/pkgs/build-support/docker/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 9f57804e957d..1ac0a69f7451 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -487,7 +487,7 @@ rec { ''; }; - buildLayeredImage = { name, ... }@args: + buildLayeredImage = lib.makeOverridable ({ name, ... }@args: let stream = streamLayeredImage args; in @@ -496,7 +496,8 @@ rec { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; nativeBuildInputs = [ pigz ]; - } "${stream} | pigz -nTR > $out"; + } "${stream} | pigz -nTR > $out" + ); # 1. extract the base image # 2. create the layer @@ -504,7 +505,7 @@ rec { # 4. compute the layer id # 5. put the layer in the image # 6. repack the image - buildImage = + buildImage = lib.makeOverridable ( args@{ # Image name. name @@ -751,7 +752,8 @@ rec { ''; in - checked result; + checked result + ); # Merge the tarballs of images built with buildImage into a single # tarball that contains all images. Running `docker load` on the resulting @@ -837,7 +839,7 @@ rec { }) ); - streamLayeredImage = + streamLayeredImage = lib.makeOverridable ( { # Image Name name @@ -1046,7 +1048,8 @@ rec { makeWrapper ${streamScript} $out --add-flags ${conf} ''; in - result; + result + ); # This function streams a docker image that behaves like a nix-shell for a derivation streamNixShellImage = |