gnu: Properly credit Konrad Hinsen.

[jackhill/guix/guix.git] / tests / snix.scm

diff --git a/tests/snix.scm b/tests/snix.scm
index 89582f2..4c31e33 100644 (file)
--- a/tests/snix.scm
+++ b/tests/snix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -17,14 +17,16 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (test-snix)
-  #:use-module (guix snix)
-  #:use-module ((guix utils) #:select (%nixpkgs-directory))
+  #:use-module (guix import snix)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))
 
+(define %nixpkgs-directory
+  (getenv "NIXPKGS"))
+
 (define factorize-uri
-  (@@ (guix snix) factorize-uri))
+  (@@ (guix import snix) factorize-uri))
 
 (define-syntax-rule (every? proc lists ...)
   (not (not (every proc lists ...))))
@@ -43,14 +45,14 @@
             ("http://example.com/2.8/foo-2.8.tgz" "2.8"
              -> ("http://example.com/" version "/foo-" version ".tgz")))))
 
-(test-skip (if (and (%nixpkgs-directory)
-                    (file-exists? (string-append (%nixpkgs-directory)
+(test-skip (if (and %nixpkgs-directory
+                    (file-exists? (string-append %nixpkgs-directory
                                                  "/default.nix")))
                0
                1))
 
 (test-assert "nixpkgs->guix-package"
-  (match (nixpkgs->guix-package (%nixpkgs-directory) "guile")
+  (match (nixpkgs->guix-package %nixpkgs-directory "guile")
     (('package
        ('name "guile")
        ('version (? string?))
@@ -69,11 +71,3 @@
      (pk 'fail x #f))))
 
 (test-end "snix")
-
-\f
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; eval: (put 'guard 'scheme-indent-function 1)
-;;; End: