summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-04-30 15:26:22 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-05-01 06:27:03 +0000
commitf0d15b4e0dbe5d30711e4adbad52127214a7b193 (patch)
tree4aef021752b9c2ad94f404845f1306759acafc96
parentMerge pull request #229197 from NixOS/backport-228559-to-release-22.11 (diff)
downloadnixpkgs-origin/backport-229132-to-release-22.11.tar.gz
tarball job: tag both derivations as big-parallelorigin/backport-229132-to-release-22.11
The aim here is to avoid exhausting RAM of our normal machines on hydra.nixos.org. See #227945 for details. (cherry picked from commit e471f6963fe60c3315e25afc98a16e180cad5a10)
-rw-r--r--pkgs/top-level/make-tarball.nix2
-rw-r--r--pkgs/top-level/nixpkgs-basic-release-checks.nix8
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index fca1b7d76e03..61ed61192d5c 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -32,6 +32,8 @@ pkgs.releaseTools.sourceTarball {
echo "git-revision is $(cat .git-revision)"
'';
+ requiredSystemFeatures = [ "big-parallel" ]; # 1 thread but ~36G RAM (!) see #227945
+
nixpkgs-basic-release-checks = import ./nixpkgs-basic-release-checks.nix
{ inherit nix pkgs nixpkgs supportedSystems; };
diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix
index e2b81b20c5b0..8d9a13ff9dc5 100644
--- a/pkgs/top-level/nixpkgs-basic-release-checks.nix
+++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix
@@ -1,6 +1,12 @@
{ supportedSystems, nixpkgs, pkgs, nix }:
-pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } ''
+pkgs.runCommand "nixpkgs-release-checks"
+ {
+ src = nixpkgs;
+ buildInputs = [ nix ];
+ requiredSystemFeatures = [ "big-parallel" ]; # 1 thread but ~10G RAM; see #227945
+ }
+ ''
set -o pipefail
export NIX_STORE_DIR=$TMPDIR/store