mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-18 12:47:33 -05:00
ca71942445
This removes (guix hash) and (guix pk-crypto), which now live as part of Guile-Gcrypt (version 0.1.0.) * guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm, tests/hash.scm, tests/pk-crypto.scm: Remove. * configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and LIBGCRYPT_LIBDIR assignments. * m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove. * README: Add Guile-Gcrypt to the dependencies; move libgcrypt as "required unless --disable-daemon". * doc/guix.texi (Requirements): Likewise. * gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm, guix/git.scm, guix/http-client.scm, guix/import/cpan.scm, guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm, guix/import/gnu.scm, guix/import/hackage.scm, guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm, guix/pki.scm, guix/scripts/archive.scm, guix/scripts/authenticate.scm, guix/scripts/download.scm, guix/scripts/hash.scm, guix/scripts/pack.scm, guix/scripts/publish.scm, guix/scripts/refresh.scm, guix/scripts/substitute.scm, guix/store.scm, guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm, tests/builders.scm, tests/challenge.scm, tests/cpan.scm, tests/crate.scm, tests/derivations.scm, tests/gem.scm, tests/nar.scm, tests/opam.scm, tests/pki.scm, tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm, tests/store.scm, tests/substitute.scm: Adjust imports. * gnu/system/vm.scm: Likewise. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (expression->derivation-in-linux-vm)[config]: Remove. (iso9660-image)[config]: Remove. (qemu-image)[config]: Remove. (system-docker-image)[config]: Remove. * guix/scripts/pack.scm: Adjust imports. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (self-contained-tarball)[build]: Call 'make-config.scm' without #:libgcrypt argument. (squashfs-image)[libgcrypt]: Remove. [build]: Call 'make-config.scm' without #:libgcrypt. (docker-image)[config, json]: Remove. [build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from the imported modules. * guix/self.scm (specification->package): Remove "libgcrypt", add "guile-gcrypt". (compiled-guix): Remove #:libgcrypt. [guile-gcrypt]: New variable. [dependencies]: Add it. [*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call. Add #:extensions. [*config*]: Remove #:libgcrypt from 'make-config.scm' call. (%dependency-variables): Remove %libgcrypt. (make-config.scm): Remove #:libgcrypt. * build-aux/build-self.scm (guile-gcrypt): New variable. (make-config.scm): Remove #:libgcrypt. (build-program)[fake-gcrypt-hash]: New variable. Add (gcrypt hash) to the imported modules. Adjust load path assignments. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search path.
103 lines
3.3 KiB
Scheme
103 lines
3.3 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (test-base32)
|
|
#:use-module (gcrypt hash)
|
|
#:use-module (guix base32)
|
|
#:use-module (guix utils)
|
|
#: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"
|
|
(fold (lambda (bv expected result)
|
|
(and result
|
|
(string=? (bytevector->base32-string bv)
|
|
expected)))
|
|
#t
|
|
|
|
;; Examples from RFC 4648.
|
|
(map string->utf8 '("" "f" "fo" "foo" "foob" "fooba" "foobar"))
|
|
'(""
|
|
"my"
|
|
"mzxq"
|
|
"mzxw6"
|
|
"mzxw6yq"
|
|
"mzxw6ytb"
|
|
"mzxw6ytboi")))
|
|
|
|
(test-assert "base32-string->bytevector"
|
|
(every (lambda (bv)
|
|
(equal? (base32-string->bytevector
|
|
(bytevector->base32-string bv))
|
|
bv))
|
|
;; Examples from RFC 4648.
|
|
(map string->utf8 '("" "f" "fo" "foo" "foob" "fooba" "foobar"))))
|
|
|
|
(test-assert "nix-base32-string->bytevector"
|
|
(every (lambda (bv)
|
|
(equal? (nix-base32-string->bytevector
|
|
(bytevector->nix-base32-string bv))
|
|
bv))
|
|
;; Examples from RFC 4648.
|
|
(map string->utf8 '("" "f" "fo" "foo" "foob" "fooba" "foobar"))))
|
|
|
|
(test-equal "&invalid-base32-character"
|
|
#\e
|
|
(guard (c ((invalid-base32-character? c)
|
|
(invalid-base32-character-value c)))
|
|
(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)
|