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 /guix/config.scm.in | |
| parent | dd01fecd23a4ded46b99a51dc08ac5d964dbcd53 (diff) | |
| download | gnu-guix-f073e52382d2ddcc638de73533bbf798f600d78a.tar gnu-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 'guix/config.scm.in')
| -rw-r--r-- | guix/config.scm.in | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/guix/config.scm.in b/guix/config.scm.in index eaadae9618..764e466bc5 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,7 +27,6 @@ %guix-register-program %system %libgcrypt - %nixpkgs %nix-instantiate %gzip %bzip2 @@ -73,11 +72,6 @@ (define %libgcrypt "@LIBGCRYPT@") -(define %nixpkgs - (if (string=? "@NIXPKGS@" "") - #f - "@NIXPKGS@")) - (define %nix-instantiate "@NIX_INSTANTIATE@") |