From 178f1e1f5d3c0d53870c4646679efc6a8b10f698 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 4 Apr 2024 21:40:08 +0100
Subject: [PATCH] pkgs/top-level/release.nix: drop unused `dist` targets

The PR https://github.com/NixOS/nixpkgs/pull/284090 exposed `build`
target directly on hydra. We are using it now in
https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/bootstrap-files
to generate bootstrap tarballs on `linux` and `darwin`.

`dist` was not very useful as it was a bit hard to link back to hydra
jobs that build it. Let's just drop it.
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix |  6 ------
 pkgs/stdenv/linux/make-bootstrap-tools.nix  | 16 ----------------
 pkgs/top-level/release.nix                  |  4 ++--
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 83e982142d30..1783ac7a535a 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -276,12 +276,6 @@ rec {
     };
   };
 
-  dist = runCommand "stdenv-bootstrap-tools" {} ''
-    mkdir -p $out/nix-support
-    echo "file tarball ${build}/on-server/*.tar.xz" >> $out/nix-support/hydra-build-products
-    echo "file unpack ${build}/on-server/unpack.* " >> $out/nix-support/hydra-build-products
-  '';
-
   bootstrapFiles = {
     bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz";
     unpack = runCommand "unpack" { allowedReferences = []; } ''
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 1334c13ad170..874330331bb8 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -212,22 +212,6 @@ in with pkgs; rec {
       allowedReferences = [];
     };
 
-  dist = stdenv.mkDerivation {
-    name = "stdenv-bootstrap-tools";
-
-    meta = {
-      # Increase priority to unblock nixpkgs-unstable
-      # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288
-      schedulingPriority = 200;
-    };
-
-    buildCommand = ''
-      mkdir -p $out/nix-support
-      echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products
-      echo "file busybox ${build}/on-server/busybox" >> $out/nix-support/hydra-build-products
-    '';
-  };
-
   bootstrapFiles = {
     # Make them their own store paths to test that busybox still works when the binary is named /nix/store/HASH-busybox
     busybox = runCommand "busybox" {} "cp ${build}/on-server/busybox $out";
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1941733d0029..5fac0bb1b460 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -234,7 +234,7 @@ let
                 };
               };
             in {
-              inherit (bootstrap) build dist test;
+              inherit (bootstrap) build test;
             }
           else if hasSuffix "-darwin" config then
             let
@@ -243,7 +243,7 @@ let
               };
             in {
               # Lightweight distribution and test
-              inherit (bootstrap) build dist test;
+              inherit (bootstrap) build test;
               # Test a full stdenv bootstrap from the bootstrap tools definition
               # TODO: Re-enable once the new bootstrap-tools are in place.
               #inherit (bootstrap.test-pkgs) stdenv;