From e471f6963fe60c3315e25afc98a16e180cad5a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 30 Apr 2023 15:26:22 +0200 Subject: [PATCH] tarball job: tag both derivations as big-parallel The aim here is to avoid exhausting RAM of our normal machines on hydra.nixos.org. See #227945 for details. --- pkgs/top-level/make-tarball.nix | 2 ++ pkgs/top-level/nixpkgs-basic-release-checks.nix | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index ea975a9b6fcc..abc121e29dc7 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 ab9dac4b380c..0b4af4114ef8 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