Merge #126734: darwin: temporarily disable bootstrap stdenv test

This commit is contained in:
Vladimír Čunát 2021-06-15 09:46:17 +02:00
commit 4b7c8d538e
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 7 additions and 6 deletions

View file

@ -4,6 +4,7 @@
, config
, overlays
, crossOverlays ? [ ]
, bootstrapLlvmVersion ? if localSystem.isAarch64 then "11.1.0" else "7.1.0"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? if localSystem.isAarch64 then
let
@ -40,14 +41,11 @@ assert crossSystem == localSystem;
let
inherit (localSystem) system;
# Bootstrap version needs to be known to reference headers included in the bootstrap tools
bootstrapLlvmVersion = if localSystem.isAarch64 then "11.1.0" else "7.1.0";
useAppleSDKLibs = localSystem.isAarch64;
haveKRB5 = localSystem.isx86_64;
# final toolchain is injected into llvmPackages_${finalLlvmVersion}
finalLlvmVersion = if localSystem.isAarch64 then "11" else "7";
finalLlvmVersion = lib.versions.major bootstrapLlvmVersion;
finalLlvmPackages = "llvmPackages_${finalLlvmVersion}";
commonImpureHostDeps = [

View file

@ -254,6 +254,8 @@ in rec {
'';
};
bootstrapLlvmVersion = llvmPackages.llvm.version;
bootstrapFiles = {
sh = "${build}/on-server/sh";
bzip2 = "${build}/on-server/bzip2";
@ -408,7 +410,7 @@ in rec {
system = if crossSystem != null then crossSystem else system;
stdenvStages = args: let
args' = args // { inherit bootstrapFiles; };
args' = args // { inherit bootstrapLlvmVersion bootstrapFiles; };
in (import (test-pkgspath + "/pkgs/stdenv/darwin") args').stagesDarwin;
};
}

View file

@ -174,7 +174,8 @@ let
# Lightweight distribution and test
inherit (bootstrap) dist test;
# Test a full stdenv bootstrap from the bootstrap tools definition
inherit (bootstrap.test-pkgs) stdenv;
# TODO re-enable with https://github.com/NixOS/nixpkgs/pull/126411
# inherit (bootstrap.test-pkgs) stdenv;
};
# Cross compiled bootstrap tools