diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-06 22:33:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-06 23:51:04 +0200 |
| commit | f073e52382d2ddcc638de73533bbf798f600d78a (patch) | |
| tree | e51183c70aee2452d20c965feb515689da2dcb28 /tests/derivations.scm | |
| parent | dd01fecd23a4ded46b99a51dc08ac5d964dbcd53 (diff) | |
| download | guix-f073e52382d2ddcc638de73533bbf798f600d78a.tar guix-f073e52382d2ddcc638de73533bbf798f600d78a.tar.gz | |
utils: Remove Nixpkgs helpers.
* guix/config.scm.in (%nixpkgs): Remove.
* guix/utils.scm (%nixpkgs-directory, nixpkgs-derivation,
nixpkgs-derivation*): Remove.
* test-env.in: Export 'NIXPKGS'.
* tests/derivations.scm (%coreutils): Remove use of
'nixpkgs-derivation'.
* tests/snix.scm (%nixpkgs-directory): New variable.
Adjust users accordingly.
Diffstat (limited to 'tests/derivations.scm')
| -rw-r--r-- | tests/derivations.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 21a832fabe..9fc96c71ae 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -476,8 +476,7 @@ (define %coreutils (false-if-exception (and (network-reachable?) - (or (package-derivation %store %bootstrap-coreutils&co) - (nixpkgs-derivation "coreutils"))))) + (package-derivation %store %bootstrap-coreutils&co)))) (test-skip (if %coreutils 0 1)) |