@@ -442,6 +442,7 @@ rec {
443 runCommand "${name}.tar.gz" {
443 runCommand "${name}.tar.gz" {
444 inherit (stream) imageName;
444 inherit (stream) imageName;
445+ passthru = { inherit (stream) imageTag; };
445 buildInputs = [ pigz ];
446 buildInputs = [ pigz ];
446 } "${stream} | pigz -nT > $out";
447 } "${stream} | pigz -nT > $out";
@@ -517,6 +518,11 @@ rec {
517 layerClosure = writeReferencesToFile layer;
518 layerClosure = writeReferencesToFile layer;
518 passthru.buildArgs = args;
519 passthru.buildArgs = args;
519 passthru.layer = layer;
520 passthru.layer = layer;
523+ then lib.toLower tag
525+ lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
520 # Docker can't be made to run darwin binaries
526 # Docker can't be made to run darwin binaries
521 meta.badPlatforms = lib.platforms.darwin;
527 meta.badPlatforms = lib.platforms.darwin;
@@ -737,6 +743,11 @@ rec {
737 conf = runCommand "${name}-conf.json" {
743 conf = runCommand "${name}-conf.json" {
738 inherit maxLayers created;
744 inherit maxLayers created;
739 imageName = lib.toLower name;
745 imageName = lib.toLower name;
750+ lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
740 paths = referencesByPopularity overallClosure;
751 paths = referencesByPopularity overallClosure;
741 buildInputs = [ jq ];
752 buildInputs = [ jq ];
@@ -792,6 +803,7 @@ rec {
793 result = runCommand "stream-${name}" {
804 result = runCommand "stream-${name}" {
794 inherit (conf) imageName;
805 inherit (conf) imageName;
806+ passthru = { inherit (conf) imageTag; };
795 buildInputs = [ makeWrapper ];
807 buildInputs = [ makeWrapper ];
797 makeWrapper ${streamScript} $out --add-flags ${conf}
809 makeWrapper ${streamScript} $out --add-flags ${conf}