diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-01-20 11:35:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-01-21 00:14:38 +0100 |
commit | 3d43b7aef3d5b7ad2ba0418d2afd657e5fedeaf5 (patch) | |
tree | 53f1b74f436171843008f65c0d8fc8c70162d1a5 /guix/import/gem.scm | |
parent | 41134f915f523601fa183f180b801a872b428fc3 (diff) | |
download | guix-patches-3d43b7aef3d5b7ad2ba0418d2afd657e5fedeaf5.tar guix-patches-3d43b7aef3d5b7ad2ba0418d2afd657e5fedeaf5.tar.gz |
import, swh: Adjust to Guile-JSON 4.5.x unspecified value handling.
* guix/import/cpan.scm (<cpan-release>)[home-page]: Add 'unspecified?'
case.
* guix/import/gem.scm (<gem>)[licenses]: Likewise.
(json->gem-dependency-list): Likewise.
* guix/swh.scm (<directory-entry>)[checksums]: Likewise.
Diffstat (limited to 'guix/import/gem.scm')
-rw-r--r-- | guix/import/gem.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/import/gem.scm b/guix/import/gem.scm index 1f6f94532e..418d716be6 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> -;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; ;;; This file is part of GNU Guix. @@ -49,6 +49,7 @@ ;; This is sometimes #nil (the JSON 'null' value). Arrange ;; to always return a list. (cond ((not licenses) '()) + ((unspecified? licenses) '()) ((vector? licenses) (vector->list licenses)) (else '())))) (info gem-info) @@ -69,7 +70,7 @@ json->gem-dependency-list)) (define (json->gem-dependency-list vector) - (if vector + (if (and vector (not (unspecified? vector))) (map json->gem-dependency (vector->list vector)) '())) |