Unverified Commit f5eb4924 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #301639 from trofi/release-drop-dist 

pkgs/top-level/release.nix: drop unused `dist` targets
parents 12dbef93 178f1e1f

pkgs/stdenv/darwin/make-bootstrap-tools.nix

+0 −6
Original line number Diff line number Diff line
@@ -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 = []; } ''

pkgs/stdenv/linux/make-bootstrap-tools.nix

+0 −16
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/release.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;