From f073e52382d2ddcc638de73533bbf798f600d78a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 6 Oct 2015 22:33:03 +0200 Subject: 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. --- tests/derivations.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/derivations.scm') 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)) -- cgit v1.2.3