mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-15 03:15:09 -05:00
81c3dc3224
Guile-JSON 3.x is incompatible with Guile-JSON 1.x, which we relied on
until now: it maps JSON dictionaries to alists (instead of hash tables),
and JSON arrays to vectors (instead of lists). This commit is about
adjusting all the existing code to this new mapping.
* m4/guix.m4 (GUIX_CHECK_GUILE_JSON): New macro.
* configure.ac: Use it.
* doc/guix.texi (Requirements): Mention the Guile-JSON version.
* guix/git-download.scm (git-fetch)[guile-json]: Use GUILE-JSON-3.
* guix/import/cpan.scm (string->license): Expect vectors instead of
lists.
(module->dist-name): Use 'json-fetch' instead of 'json-fetch-alist'.
(cpan-fetch): Likewise.
* guix/import/crate.scm (crate-fetch): Likewise, and call 'vector->list'
for DEPS.
* guix/import/gem.scm (rubygems-fetch): Likewise.
* guix/import/json.scm (json-fetch-alist): Remove.
* guix/import/pypi.scm (pypi-fetch): Use 'json-fetch' instead of
'json-fetch-alist'.
(latest-source-release, latest-wheel-release): Call 'vector->list' on
RELEASES.
* guix/import/stackage.scm (stackage-lts-info-fetch): Use 'json-fetch'
instead of 'json-fetch-alist'.
(lts-package-version): Use 'vector->list'.
* guix/import/utils.scm (hash-table->alist): Remove.
(alist->package): Pass 'vector->list' on the inputs fields, and default
to the empty vector.
* guix/scripts/import/json.scm (guix-import-json): Remove call to
'hash-table->alist'.
* guix/swh.scm (define-json-reader): Expect pair? or null? instead of
hash-table?.
[extract-field]: Use 'assoc-ref' instead of 'hash-ref'.
(json->branches): Use 'map' instead of 'hash-map->list'.
(json->checksums): Likewise.
(json->directory-entries, origin-visits): Call 'vector->list' on the
result of 'json->scm'.
* tests/import-utils.scm ("alist->package with dependencies"): New test.
* gnu/installer.scm (build-compiled-file)[builder]: Use GUILE-JSON-3.
* gnu/installer.scm (installer-program)[installer-builder]: Likewise.
* gnu/installer/locale.scm (iso639->iso639-languages): Use 'assoc-ref'
instead of 'hash-ref', and pass vectors through 'vector->list'.
(iso3166->iso3166-territories): Likewise.
* gnu/system/vm.scm (system-docker-image)[build]: Use GUILE-JSON-3.
* guix/docker.scm (manifest, config): Adjust for Guile-JSON 3.
* guix/scripts/pack.scm (docker-image)[build]: Use GUILE-JSON-3.
* guix/import/github.scm (fetch-releases-or-tags): Update docstring.
(latest-released-version): Use 'assoc-ref' instead of 'hash-ref'. Pass
the result of 'fetch-releases-or-tags' to 'vector->list'.
* guix/import/launchpad.scm (latest-released-version): Likewise.
123 lines
5.3 KiB
Scheme
123 lines
5.3 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
|
|
;;; Copyright © 2016 Ben Woodcroft <donttrustben@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-import-utils)
|
|
#:use-module (guix tests)
|
|
#:use-module (guix import utils)
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
#:use-module (guix packages)
|
|
#:use-module (guix build-system)
|
|
#:use-module (gnu packages)
|
|
#:use-module (srfi srfi-64))
|
|
|
|
(test-begin "import-utils")
|
|
|
|
(test-equal "beautify-description: use double spacing"
|
|
"This is a package. It is great. Trust me Mr. Hendrix."
|
|
(beautify-description
|
|
"This is a package. It is great. Trust me Mr. Hendrix."))
|
|
|
|
(test-equal "beautify-description: transform fragment into sentence"
|
|
"This package provides a function to establish world peace"
|
|
(beautify-description "A function to establish world peace"))
|
|
|
|
(test-equal "license->symbol"
|
|
'license:lgpl2.0
|
|
(license->symbol license:lgpl2.0))
|
|
|
|
(test-assert "alist->package with simple source"
|
|
(let* ((meta '(("name" . "hello")
|
|
("version" . "2.10")
|
|
("source" .
|
|
;; Use a 'file://' URI so that we don't cause a download.
|
|
,(string-append "file://"
|
|
(search-path %load-path "guix.scm")))
|
|
("build-system" . "gnu")
|
|
("home-page" . "https://gnu.org")
|
|
("synopsis" . "Say hi")
|
|
("description" . "This package says hi.")
|
|
("license" . "GPL-3.0+")))
|
|
(pkg (alist->package meta)))
|
|
(and (package? pkg)
|
|
(license:license? (package-license pkg))
|
|
(build-system? (package-build-system pkg))
|
|
(origin? (package-source pkg)))))
|
|
|
|
(test-assert "alist->package with explicit source"
|
|
(let* ((meta '(("name" . "hello")
|
|
("version" . "2.10")
|
|
("source" . (("method" . "url-fetch")
|
|
("uri" . "mirror://gnu/hello/hello-2.10.tar.gz")
|
|
("sha256" .
|
|
(("base32" .
|
|
"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))))
|
|
("build-system" . "gnu")
|
|
("home-page" . "https://gnu.org")
|
|
("synopsis" . "Say hi")
|
|
("description" . "This package says hi.")
|
|
("license" . "GPL-3.0+")))
|
|
(pkg (alist->package meta)))
|
|
(and (package? pkg)
|
|
(license:license? (package-license pkg))
|
|
(build-system? (package-build-system pkg))
|
|
(origin? (package-source pkg))
|
|
(equal? (origin-sha256 (package-source pkg))
|
|
(base32 "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))))
|
|
|
|
(test-equal "alist->package with false license" ;<https://bugs.gnu.org/30470>
|
|
'license-is-false
|
|
(let* ((meta '(("name" . "hello")
|
|
("version" . "2.10")
|
|
("source" . (("method" . "url-fetch")
|
|
("uri" . "mirror://gnu/hello/hello-2.10.tar.gz")
|
|
("sha256" .
|
|
(("base32" .
|
|
"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))))
|
|
("build-system" . "gnu")
|
|
("home-page" . "https://gnu.org")
|
|
("synopsis" . "Say hi")
|
|
("description" . "This package says hi.")
|
|
("license" . #f))))
|
|
;; Note: Use 'or' because comparing with #f otherwise succeeds when
|
|
;; there's an exception instead of an actual #f.
|
|
(or (package-license (alist->package meta))
|
|
'license-is-false)))
|
|
|
|
(test-equal "alist->package with dependencies"
|
|
`(("gettext" ,(specification->package "gettext")))
|
|
(let* ((meta '(("name" . "hello")
|
|
("version" . "2.10")
|
|
("source" . (("method" . "url-fetch")
|
|
("uri" . "mirror://gnu/hello/hello-2.10.tar.gz")
|
|
("sha256" .
|
|
(("base32" .
|
|
"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))))
|
|
("build-system" . "gnu")
|
|
("home-page" . "https://gnu.org")
|
|
("synopsis" . "Say hi")
|
|
("description" . "This package says hi.")
|
|
;
|
|
;; Note: As with Guile-JSON 3.x, JSON arrays are represented
|
|
;; by vectors.
|
|
("native-inputs" . #("gettext"))
|
|
|
|
("license" . #f))))
|
|
(package-native-inputs (alist->package meta))))
|
|
|
|
(test-end "import-utils")
|