mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 19:35:25 -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.
181 lines
6.4 KiB
Scheme
181 lines
6.4 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2015 David Thompson <davet@gnu.org>
|
|
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
|
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
|
;;;
|
|
;;; 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-gem)
|
|
#:use-module (guix import gem)
|
|
#:use-module (guix base32)
|
|
#:use-module (gcrypt hash)
|
|
#:use-module (guix tests)
|
|
#:use-module ((guix build utils) #:select (delete-file-recursively))
|
|
#:use-module (srfi srfi-41)
|
|
#:use-module (srfi srfi-64)
|
|
#:use-module (ice-9 match))
|
|
|
|
(define test-foo-json
|
|
"{
|
|
\"name\": \"foo\",
|
|
\"version\": \"1.0.0\",
|
|
\"sha\": \"f3676eafca9987cb5fe263df1edf2538bf6dafc712b30e17be3543a9680547a8\",
|
|
\"info\": \"A cool gem\",
|
|
\"homepage_uri\": \"https://example.com\",
|
|
\"dependencies\": {
|
|
\"runtime\": [
|
|
{ \"name\": \"bundler\" },
|
|
{ \"name\": \"bar\" }
|
|
]
|
|
},
|
|
\"licenses\": [\"MIT\", \"Apache 2.0\"]
|
|
}")
|
|
|
|
(define test-bar-json
|
|
"{
|
|
\"name\": \"bar\",
|
|
\"version\": \"1.0.0\",
|
|
\"sha\": \"f3676eafca9987cb5fe263df1edf2538bf6dafc712b30e17be3543a9680547a8\",
|
|
\"info\": \"Another cool gem\",
|
|
\"homepage_uri\": \"https://example.com\",
|
|
\"dependencies\": {
|
|
\"runtime\": [
|
|
{ \"name\": \"bundler\" },
|
|
]
|
|
},
|
|
\"licenses\": [\"MIT\", \"Apache 2.0\"]
|
|
}")
|
|
|
|
(define test-bundler-json
|
|
"{
|
|
\"name\": \"bundler\",
|
|
\"version\": \"1.14.2\",
|
|
\"sha\": \"3bb53e03db0a8008161eb4c816ccd317120d3c415ba6fee6f90bbc7f7eec8690\",
|
|
\"info\": \"Ruby gem bundler\",
|
|
\"homepage_uri\": \"https://bundler.io/\",
|
|
\"dependencies\": {
|
|
\"runtime\": []
|
|
},
|
|
\"licenses\": [\"MIT\"]
|
|
}")
|
|
|
|
(test-begin "gem")
|
|
|
|
(test-assert "gem->guix-package"
|
|
;; Replace network resources with sample data.
|
|
(mock ((guix http-client) http-fetch
|
|
(lambda (url . rest)
|
|
(match url
|
|
("https://rubygems.org/api/v1/gems/foo.json"
|
|
(values (open-input-string test-foo-json)
|
|
(string-length test-foo-json)))
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(match (gem->guix-package "foo")
|
|
(('package
|
|
('name "ruby-foo")
|
|
('version "1.0.0")
|
|
('source ('origin
|
|
('method 'url-fetch)
|
|
('uri ('rubygems-uri "foo" 'version))
|
|
('sha256
|
|
('base32
|
|
"1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk"))))
|
|
('build-system 'ruby-build-system)
|
|
('propagated-inputs
|
|
('quasiquote
|
|
(("bundler" ('unquote 'bundler))
|
|
("ruby-bar" ('unquote 'ruby-bar)))))
|
|
('synopsis "A cool gem")
|
|
('description "This package provides a cool gem")
|
|
('home-page "https://example.com")
|
|
('license ('list 'license:expat 'license:asl2.0)))
|
|
#t)
|
|
(x
|
|
(pk 'fail x #f)))))
|
|
|
|
(test-assert "gem-recursive-import"
|
|
;; Replace network resources with sample data.
|
|
(mock ((guix http-client) http-fetch
|
|
(lambda (url . rest)
|
|
(match url
|
|
("https://rubygems.org/api/v1/gems/foo.json"
|
|
(values (open-input-string test-foo-json)
|
|
(string-length test-foo-json)))
|
|
("https://rubygems.org/api/v1/gems/bar.json"
|
|
(values (open-input-string test-bar-json)
|
|
(string-length test-bar-json)))
|
|
("https://rubygems.org/api/v1/gems/bundler.json"
|
|
(values (open-input-string test-bundler-json)
|
|
(string-length test-bundler-json)))
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(match (stream->list (gem-recursive-import "foo"))
|
|
((('package
|
|
('name "ruby-foo")
|
|
('version "1.0.0")
|
|
('source
|
|
('origin
|
|
('method 'url-fetch)
|
|
('uri ('rubygems-uri "foo" 'version))
|
|
('sha256
|
|
('base32
|
|
"1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk"))))
|
|
('build-system 'ruby-build-system)
|
|
('propagated-inputs
|
|
('quasiquote
|
|
(("bundler" ('unquote 'bundler))
|
|
("ruby-bar" ('unquote 'ruby-bar)))))
|
|
('synopsis "A cool gem")
|
|
('description "This package provides a cool gem")
|
|
('home-page "https://example.com")
|
|
('license ('list 'license:expat 'license:asl2.0)))
|
|
('package
|
|
('name "ruby-bundler")
|
|
('version "1.14.2")
|
|
('source
|
|
('origin
|
|
('method 'url-fetch)
|
|
('uri ('rubygems-uri "bundler" 'version))
|
|
('sha256
|
|
('base32
|
|
"1446xiz7zg0bz7kgx9jv84y0s4hpsg61dj5l3qb0i00avc1kxd9v"))))
|
|
('build-system 'ruby-build-system)
|
|
('synopsis "Ruby gem bundler")
|
|
('description "Ruby gem bundler")
|
|
('home-page "https://bundler.io/")
|
|
('license 'license:expat))
|
|
('package
|
|
('name "ruby-bar")
|
|
('version "1.0.0")
|
|
('source
|
|
('origin
|
|
('method 'url-fetch)
|
|
('uri ('rubygems-uri "bar" 'version))
|
|
('sha256
|
|
('base32
|
|
"1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk"))))
|
|
('build-system 'ruby-build-system)
|
|
('propagated-inputs
|
|
('quasiquote
|
|
(('"bundler" ('unquote 'bundler)))))
|
|
('synopsis "Another cool gem")
|
|
('description "Another cool gem")
|
|
('home-page "https://example.com")
|
|
('license ('list 'license:expat 'license:asl2.0))))
|
|
#t)
|
|
(x
|
|
(pk 'fail x #f)))))
|
|
|
|
(test-end "gem")
|