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.
		
			
				
	
	
		
			118 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
			
		
		
	
	
			118 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
| ;;; GNU Guix --- Functional package management for GNU
 | |
| ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
 | |
| ;;;
 | |
| ;;; 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-opam)
 | |
|   #:use-module (guix import opam)
 | |
|   #:use-module (guix base32)
 | |
|   #:use-module (gcrypt hash)
 | |
|   #:use-module (guix tests)
 | |
|   #:use-module ((guix build utils) #:select (delete-file-recursively mkdir-p which))
 | |
|   #:use-module (srfi srfi-64)
 | |
|   #:use-module (web uri)
 | |
|   #:use-module (ice-9 match))
 | |
| 
 | |
| (define test-url-file
 | |
|   "http: \"https://example.org/foo-1.0.0.tar.gz\"
 | |
| checksum: \"ac8920f39a8100b94820659bc2c20817\"")
 | |
| 
 | |
| (define test-source-hash
 | |
|   "")
 | |
| 
 | |
| (define test-urls
 | |
|   "repo ac8920f39a8100b94820659bc2c20817 0o644
 | |
| packages/foo/foo.1.0.0/url ac8920f39a8100b94820659bc2c20817 0o644
 | |
| packages/foo/foo.1.0.0/opam ac8920f39a8100b94820659bc2c20817 0o644
 | |
| packages/foo/foo.1.0.0/descr ac8920f39a8100b94820659bc2c20817 0o644")
 | |
| 
 | |
| (define test-opam-file
 | |
| "opam-version: 1.2
 | |
| maintainer: \"Alice Doe\"
 | |
| authors: \"Alice Doe, John Doe\"
 | |
| homepage: \"https://example.org/\"
 | |
| bug-reports: \"https://example.org/bugs\"
 | |
| license: \"MIT\"
 | |
| dev-repo: \"https://example.org/git\"
 | |
| build: [
 | |
|   \"ocaml\" \"pkg/pkg.ml\" \"build\" \"--pinned\" \"%{pinned}%\"
 | |
| ]
 | |
| build-test: [
 | |
|   \"ocaml\" \"pkg/pkg.ml\" \"build\" \"--pinned\" \"%{pinned}%\" \"--tests\" \"true\"
 | |
| ]
 | |
| depends: [
 | |
|   \"alcotest\" {test & >= \"0.7.2\"}
 | |
|   \"ocamlbuild\" {build & >= \"0.9.2\"}
 | |
| ]")
 | |
| 
 | |
| (test-begin "opam")
 | |
| 
 | |
| (test-assert "opam->guix-package"
 | |
|   ;; Replace network resources with sample data.
 | |
|     (mock ((guix import utils) url-fetch
 | |
|            (lambda (url file-name)
 | |
|              (match url
 | |
|                ("https://example.org/foo-1.0.0.tar.gz"
 | |
|                 (begin
 | |
|                   (mkdir-p "foo-1.0.0")
 | |
|                   (system* "tar" "czvf" file-name "foo-1.0.0/")
 | |
|                   (delete-file-recursively "foo-1.0.0")
 | |
|                   (set! test-source-hash
 | |
|                     (call-with-input-file file-name port-sha256))))
 | |
|                (_ (error "Unexpected URL: " url)))))
 | |
|           (mock ((guix http-client) http-fetch/cached
 | |
|                  (lambda (url . rest)
 | |
|                    (match (uri->string url)
 | |
|                      ("https://opam.ocaml.org/urls.txt"
 | |
|                       (values (open-input-string test-urls)
 | |
|                               (string-length test-urls)))
 | |
|                      (_ (error "Unexpected URL: " url)))))
 | |
|                 (mock ((guix http-client) http-fetch
 | |
|                        (lambda (url . rest)
 | |
|                          (match url
 | |
|                            ("https://opam.ocaml.org/packages/foo/foo.1.0.0/url"
 | |
|                             (values (open-input-string test-url-file)
 | |
|                                     (string-length test-url-file)))
 | |
|                            ("https://opam.ocaml.org/packages/foo/foo.1.0.0/opam"
 | |
|                             (values (open-input-string test-opam-file)
 | |
|                                     (string-length test-opam-file)))
 | |
|                            (_ (error "Unexpected URL: " url)))))
 | |
|                       (match (opam->guix-package "foo")
 | |
|                         (('package
 | |
|                            ('name "ocaml-foo")
 | |
|                            ('version "1.0.0")
 | |
|                            ('source ('origin
 | |
|                                       ('method 'url-fetch)
 | |
|                                       ('uri "https://example.org/foo-1.0.0.tar.gz")
 | |
|                                       ('sha256
 | |
|                                        ('base32
 | |
|                                         (? string? hash)))))
 | |
|                            ('build-system 'ocaml-build-system)
 | |
|                            ('inputs
 | |
|                             ('quasiquote
 | |
|                              (("ocamlbuild" ('unquote 'ocamlbuild))
 | |
|                               ("ocaml-alcotest" ('unquote 'ocaml-alcotest)))))
 | |
|                            ('home-page "https://example.org/")
 | |
|                            ('synopsis "")
 | |
|                            ('description "")
 | |
|                            ('license 'license:expat))
 | |
|                          (string=? (bytevector->nix-base32-string
 | |
|                                     test-source-hash)
 | |
|                                    hash))
 | |
|                         (x
 | |
|                          (pk 'fail x #f)))))))
 | |
| 
 | |
| (test-end "opam")
 |