diff options
| author | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
| commit | 388bd35dd0df2d231bc2cce3746d7d5fd15df23a (patch) | |
| tree | 82e7cc45b8279f83439214c7c79dc7161ffda94d /guix/import/gem.scm | |
| parent | f1c7c2f697877fcb68b53ea062ff8a88f274a2fe (diff) | |
| parent | d00380b0077b0df2a0b790bb115d07c1533b8863 (diff) | |
| download | guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar.gz | |
Merge branch 'master' into staging-next
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)) '())) |