diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-03 00:36:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 00:36:28 +0000 |
| commit | 58274c4f8d1deda9891c370273735987584c1615 (patch) | |
| tree | 12da3a2773afb1e878cdda421139d82317c66394 /pkgs/stdenv | |
| parent | d3f56086246776bbf812b09c0e58b080244bd4f4 (diff) | |
| parent | 535c1daca6705026c6858a5aca1229064ed537d0 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 421bb8502a4c..25cde589a923 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,6 +47,12 @@ in with pkgs; rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' @@ -199,6 +205,12 @@ in with pkgs; rec { 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 |