gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
pkgs/top-level/release.nix: drop unused `dist` targets
This commit is contained in:
a-n-n-a-l-e-e
2024-04-05 05:14:48 -07:00
committed by GitHub
parent 12dbef936b 178f1e1f5d
commit f5eb4924b4
3 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/darwin/make-bootstrap-tools.nix
-6
View File
@@ -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
-16
View File
@@ -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
View File
@@ -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;