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

pkgs/top-level/release.nix: drop unused dist targets

Browse Source 
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.
This commit is contained in:
Sergei Trofimovich 2024-04-04 21:40:08 +01:00
parent a2d38866bd
commit 178f1e1f5d
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/darwin/make-bootstrap-tools.nix
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 = []; } ''

16
pkgs/stdenv/linux/make-bootstrap-tools.nix
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";

4
pkgs/top-level/release.nix
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;