diff options
author | Artturin <Artturin@artturin.com> | 2023-03-02 14:40:45 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2023-03-02 22:10:50 +0100 |
commit | 6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f (patch) | |
tree | 56600818578cb446748ae78f17116cce5eee7356 /pkgs/test/stdenv | |
parent | c8b7048233f84c62ece9212888578f16a93ad1b3 (diff) | |
download | nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar.gz nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar.bz2 nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar.lz nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar.xz nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.tar.zst nixpkgs-6e422a0fbaca1d8be112f606edcf8a48fbe0eb2f.zip |
tests.stdenv.outputs-no-out: cause less rebuilds
now gcc isn't built
Diffstat (limited to 'pkgs/test/stdenv')
-rw-r--r-- | pkgs/test/stdenv/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index ba9ea8cb75b..3e8e1423532 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -4,18 +4,20 @@ { stdenv , pkgs , lib -, runCommand , testers }: let # early enough not to rebuild gcc but late enough to have patchelf earlyPkgs = stdenv.__bootPackages.stdenv.__bootPackages; + earlierPkgs = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages; # use a early stdenv so when hacking on stdenv this test can be run quickly bootStdenv = stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; pkgsStructured = import pkgs.path { config = { structuredAttrsByDefault = true; }; inherit (stdenv.hostPlatform) system; }; bootStdenvStructuredAttrsByDefault = pkgsStructured.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv; + runCommand = earlierPkgs.runCommand; + ccWrapperSubstitutionsTest = { name, stdenv', extraAttrs ? { } }: @@ -101,7 +103,7 @@ in hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; inherit lib; }); outputs-no-out = runCommand "outputs-no-out-assert" { - result = testers.testBuildFailure (stdenv.mkDerivation { + result = earlierPkgs.testers.testBuildFailure (bootStdenv.mkDerivation { NIX_DEBUG = 1; name = "outputs-no-out"; outputs = ["foo"]; |