diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-08-06 20:17:28 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-08-21 18:29:30 +0100 |
| commit | 01ce7af25add55514f737af48ea6c127bedfde67 (patch) | |
| tree | 6558a4b124d998f3c6374faadbe77f931f2f64ec /tests/cpan.scm | |
| parent | 8a3b11d1eb21e54b4f3a3cbceffed8ce2c11512e (diff) | |
| download | guix-01ce7af25add55514f737af48ea6c127bedfde67.tar guix-01ce7af25add55514f737af48ea6c127bedfde67.tar.gz | |
import: cpan: Adapt for the change to guile-json version 3.fix-cpan-importer
In guile-json version 3, JSON objects are represented as hash tables, rather
than alists.
* guix/import/cpan.scm (string->license): Change the match expression to match
on lists, rather than vectors.
(module->dist-name, cpan-source-url, cpan-version): Change assoc-ref to
hash-ref.
(cpan-module->sexp): Change assoc-ref to hash-ref, and assoc-ref* to
hash-ref*.
* tests/cpan.scm ("source-url-http", "source-url-https"): Convert the alist to
a hash table.
Diffstat (limited to 'tests/cpan.scm')
| -rw-r--r-- | tests/cpan.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/cpan.scm b/tests/cpan.scm index 189dd027e6..cdd6c0e76a 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -24,7 +24,8 @@ #:use-module (guix tests) #:use-module (guix grafts) #:use-module (srfi srfi-64) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (ice-9 hash-table)) ;; Globally disable grafts because they can trigger early builds. (%graft? #f) @@ -109,14 +110,16 @@ (test-equal "source-url-http" ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) + (alist->hash-table + `(("download_url" . + "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-equal "source-url-https" ((@@ (guix import cpan) cpan-source-url) - `(("download_url" . - "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))) + (alist->hash-table + `(("download_url" . + "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz")))) "mirror://cpan/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz") (test-end "cpan") |