diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
| commit | 2c11e7be745a790320a42a357635997310d731d0 (patch) | |
| tree | 226aafaccf6f77758ab6e0e174ff8f08318a1772 /build-aux | |
| parent | e12210dc92098d8581cea3007d57dbb6be16bb41 (diff) | |
| parent | 041d62f7cc244d7f6c0bd6d60cdf08e72d400313 (diff) | |
Merge remote-tracking branch 'origin/master' into wip-ungrafting
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/test-env.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build-aux/test-env.in b/build-aux/test-env.in index 59ab58cc94..7efc43206c 100644 --- a/build-aux/test-env.in +++ b/build-aux/test-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -91,14 +91,11 @@ then # Place for the substituter's cache. XDG_CACHE_HOME="$GUIX_STATE_DIRECTORY/cache-$$" - # For the (guix import snix) tests. - NIXPKGS="@NIXPKGS@" - export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \ GUIX_LOG_DIRECTORY GUIX_STATE_DIRECTORY GUIX_DATABASE_DIRECTORY \ GUIX_BINARY_SUBSTITUTE_URL \ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \ - GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME NIXPKGS + GUIX_CONFIGURATION_DIRECTORY XDG_CACHE_HOME # Launch the daemon without chroot support because is may be # unavailable, for instance if we're not running as root. |