mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-14 10:55:23 -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.
215 lines
8.1 KiB
Scheme
215 lines
8.1 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2014 David Thompson <davet@gnu.org>
|
|
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
|
;;;
|
|
;;; 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-pypi)
|
|
#:use-module (guix import pypi)
|
|
#:use-module (guix base32)
|
|
#:use-module (gcrypt hash)
|
|
#:use-module (guix tests)
|
|
#:use-module (guix build-system python)
|
|
#:use-module ((guix build utils) #:select (delete-file-recursively which))
|
|
#:use-module (srfi srfi-64)
|
|
#:use-module (ice-9 match))
|
|
|
|
(define test-json
|
|
"{
|
|
\"info\": {
|
|
\"version\": \"1.0.0\",
|
|
\"name\": \"foo\",
|
|
\"license\": \"GNU LGPL\",
|
|
\"summary\": \"summary\",
|
|
\"home_page\": \"http://example.com\",
|
|
},
|
|
\"releases\": {
|
|
\"1.0.0\": [
|
|
{
|
|
\"url\": \"https://example.com/foo-1.0.0.egg\",
|
|
\"packagetype\": \"bdist_egg\",
|
|
}, {
|
|
\"url\": \"https://example.com/foo-1.0.0.tar.gz\",
|
|
\"packagetype\": \"sdist\",
|
|
}, {
|
|
\"url\": \"https://example.com/foo-1.0.0-py2.py3-none-any.whl\",
|
|
\"packagetype\": \"bdist_wheel\",
|
|
}
|
|
]
|
|
}
|
|
}")
|
|
|
|
(define test-source-hash
|
|
"")
|
|
|
|
(define test-requirements
|
|
"# A comment
|
|
# A comment after a space
|
|
bar
|
|
baz > 13.37")
|
|
|
|
(define test-metadata
|
|
"{
|
|
\"run_requires\": [
|
|
{
|
|
\"requires\": [
|
|
\"bar\",
|
|
\"baz (>13.37)\"
|
|
]
|
|
}
|
|
]
|
|
}")
|
|
|
|
(test-begin "pypi")
|
|
|
|
(test-equal "guix-package->pypi-name, old URL style"
|
|
"psutil"
|
|
(guix-package->pypi-name
|
|
(dummy-package "foo"
|
|
(source (dummy-origin
|
|
(uri
|
|
"https://pypi.io/packages/source/p/psutil/psutil-4.3.0.tar.gz"))))))
|
|
|
|
(test-equal "guix-package->pypi-name, new URL style"
|
|
"certbot"
|
|
(guix-package->pypi-name
|
|
(dummy-package "foo"
|
|
(source (dummy-origin
|
|
(uri
|
|
"https://pypi.org/packages/a2/3b/4756e6a0ceb14e084042a2a65c615d68d25621c6fd446d0fc10d14c4ce7d/certbot-0.8.1.tar.gz"))))))
|
|
|
|
(test-equal "guix-package->pypi-name, several URLs"
|
|
"cram"
|
|
(guix-package->pypi-name
|
|
(dummy-package "foo"
|
|
(source
|
|
(dummy-origin
|
|
(uri (list "https://bitheap.org/cram/cram-0.7.tar.gz"
|
|
(pypi-uri "cram" "0.7"))))))))
|
|
|
|
(test-assert "pypi->guix-package"
|
|
;; Replace network resources with sample data.
|
|
(mock ((guix import utils) url-fetch
|
|
(lambda (url file-name)
|
|
(match url
|
|
("https://example.com/foo-1.0.0.tar.gz"
|
|
(begin
|
|
(mkdir "foo-1.0.0")
|
|
(with-output-to-file "foo-1.0.0/requirements.txt"
|
|
(lambda ()
|
|
(display test-requirements)))
|
|
(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))))
|
|
("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #f)
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(mock ((guix http-client) http-fetch
|
|
(lambda (url . rest)
|
|
(match url
|
|
("https://pypi.org/pypi/foo/json"
|
|
(values (open-input-string test-json)
|
|
(string-length test-json)))
|
|
("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #f)
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(match (pypi->guix-package "foo")
|
|
(('package
|
|
('name "python-foo")
|
|
('version "1.0.0")
|
|
('source ('origin
|
|
('method 'url-fetch)
|
|
('uri ('pypi-uri "foo" 'version))
|
|
('sha256
|
|
('base32
|
|
(? string? hash)))))
|
|
('build-system 'python-build-system)
|
|
('propagated-inputs
|
|
('quasiquote
|
|
(("python-bar" ('unquote 'python-bar))
|
|
("python-baz" ('unquote 'python-baz)))))
|
|
('home-page "http://example.com")
|
|
('synopsis "summary")
|
|
('description "summary")
|
|
('license 'license:lgpl2.0))
|
|
(string=? (bytevector->nix-base32-string
|
|
test-source-hash)
|
|
hash))
|
|
(x
|
|
(pk 'fail x #f))))))
|
|
|
|
(test-skip (if (which "zip") 0 1))
|
|
(test-assert "pypi->guix-package, wheels"
|
|
;; Replace network resources with sample data.
|
|
(mock ((guix import utils) url-fetch
|
|
(lambda (url file-name)
|
|
(match url
|
|
("https://example.com/foo-1.0.0.tar.gz"
|
|
(begin
|
|
(mkdir "foo-1.0.0")
|
|
(with-output-to-file "foo-1.0.0/requirements.txt"
|
|
(lambda ()
|
|
(display test-requirements)))
|
|
(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))))
|
|
("https://example.com/foo-1.0.0-py2.py3-none-any.whl"
|
|
(begin
|
|
(mkdir "foo-1.0.0.dist-info")
|
|
(with-output-to-file "foo-1.0.0.dist-info/metadata.json"
|
|
(lambda ()
|
|
(display test-metadata)))
|
|
(let ((zip-file (string-append file-name ".zip")))
|
|
;; zip always adds a "zip" extension to the file it creates,
|
|
;; so we need to rename it.
|
|
(system* "zip" zip-file "foo-1.0.0.dist-info/metadata.json")
|
|
(rename-file zip-file file-name))
|
|
(delete-file-recursively "foo-1.0.0.dist-info")))
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(mock ((guix http-client) http-fetch
|
|
(lambda (url . rest)
|
|
(match url
|
|
("https://pypi.org/pypi/foo/json"
|
|
(values (open-input-string test-json)
|
|
(string-length test-json)))
|
|
("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #f)
|
|
(_ (error "Unexpected URL: " url)))))
|
|
(match (pypi->guix-package "foo")
|
|
(('package
|
|
('name "python-foo")
|
|
('version "1.0.0")
|
|
('source ('origin
|
|
('method 'url-fetch)
|
|
('uri ('pypi-uri "foo" 'version))
|
|
('sha256
|
|
('base32
|
|
(? string? hash)))))
|
|
('build-system 'python-build-system)
|
|
('propagated-inputs
|
|
('quasiquote
|
|
(("python-bar" ('unquote 'python-bar))
|
|
("python-baz" ('unquote 'python-baz)))))
|
|
('home-page "http://example.com")
|
|
('synopsis "summary")
|
|
('description "summary")
|
|
('license 'license:lgpl2.0))
|
|
(string=? (bytevector->nix-base32-string
|
|
test-source-hash)
|
|
hash))
|
|
(x
|
|
(pk 'fail x #f))))))
|
|
|
|
(test-end "pypi")
|