diff options
Diffstat (limited to 'pkgs/build-support/docker')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 6 | ||||
-rw-r--r-- | pkgs/build-support/docker/nix-prefetch-docker.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/docker/tarsum.nix | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index ea464ebea18c8..6b8a03932f5b2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -29,7 +29,7 @@ , tarsum , util-linux , vmTools -, writeReferencesToFile +, writeClosure , writeScript , writeShellScriptBin , writeText @@ -523,7 +523,7 @@ rec { runCommand "${baseNameOf name}.tar${compress.ext}" { inherit (stream) imageName; - passthru = { inherit (stream) imageTag; }; + passthru = { inherit (stream) imageTag; inherit stream; }; nativeBuildInputs = compress.nativeInputs; } "${stream} | ${compress.compress} > $out" ); @@ -630,7 +630,7 @@ rec { imageName = lib.toLower name; imageTag = lib.optionalString (tag != null) tag; inherit fromImage baseJson; - layerClosure = writeReferencesToFile layer; + layerClosure = writeClosure [ layer ]; passthru.buildArgs = args; passthru.layer = layer; passthru.imageTag = diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 61e917461ed9b..18accd135c04e 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Script used to obtain source hashes for dockerTools.pullImage"; + mainProgram = "nix-prefetch-docker"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/build-support/docker/tarsum.nix index 734c6b3d5aeb8..f62a8d49389aa 100644 --- a/pkgs/build-support/docker/tarsum.nix +++ b/pkgs/build-support/docker/tarsum.nix @@ -39,4 +39,5 @@ stdenv.mkDerivation { }; meta.platforms = go.meta.platforms; + meta.mainProgram = "tarsum"; } |