diff options
| -rw-r--r-- | build-aux/pre-inst-env.in | 9 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tests/base32.scm | 31 |
3 files changed, 2 insertions, 43 deletions
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index e0aa7fe868..cd90a06cbc 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2017 Eric Bavier <bavier@cray.com> # # This file is part of GNU Guix. @@ -46,13 +46,6 @@ export PATH GUIX="$abs_top_builddir/scripts/guix" export GUIX -# The following variables need only be defined when compiling Guix -# modules, but we define them to be on the safe side in case of -# auto-compilation. - -NIX_HASH="@NIX_HASH@" -export NIX_HASH - # Define $GUIX_UNINSTALLED to prevent `guix' from # prepending @guilemoduledir@ to the Guile load paths. diff --git a/configure.ac b/configure.ac index 7959d08cd7..adca374619 100644 --- a/configure.ac +++ b/configure.ac @@ -194,11 +194,6 @@ AC_ARG_WITH([nix-prefix], esac], []) -AC_PATH_PROG([NIX_HASH], [nix-hash]) -if test "x$guix_build_daemon$NIX_HASH" = "xno"; then - AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.]) -fi - AC_ARG_WITH([nixpkgs], [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR (for testing purposes only)])], diff --git a/tests/base32.scm b/tests/base32.scm index 134e578633..a999edcacc 100644 --- a/tests/base32.scm +++ b/tests/base32.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2015, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,26 +23,12 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-64) - #:use-module (ice-9 rdelim) - #:use-module (ice-9 popen) #:use-module (ice-9 match) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports)) ;; Test the (guix base32) module. -(define %nix-hash - (or (and=> (getenv "NIX_HASH") - (match-lambda - ("" #f) - (val val))) - "nix-hash")) - -(define %have-nix-hash? - ;; Note: Use `system', not `system*', because of <http://bugs.gnu.org/13166>. - (false-if-exception - (zero? (system (string-append %nix-hash " --version"))))) - (test-begin "base32") (test-assert "bytevector->base32-string" @@ -85,19 +71,4 @@ (nix-base32-string->bytevector (string-append (make-string 51 #\a) "e")))) -;; The following test requires `nix-hash' in $PATH. -(unless %have-nix-hash? - (test-skip 1)) - -(test-assert "sha256 & bytevector->nix-base32-string" - (let ((file (search-path %load-path "tests/test.drv"))) - (equal? (bytevector->nix-base32-string - (sha256 (call-with-input-file file get-bytevector-all))) - (let* ((c (format #f "~a --type sha256 --base32 --flat \"~a\"" - %nix-hash file)) - (p (open-input-pipe c)) - (l (read-line p))) - (close-pipe p) - l)))) - (test-end) |