aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2019-08-22 14:24:11 -0400
committerMark H Weaver <mhw@netris.org>2019-08-22 14:24:11 -0400
commitd020821c0bd2206a5f3d4db155f2a9a3de7dc670 (patch)
treec792d7e0e0d31cf30382ea638d46fefa6f55dfaa
parent47c95c94b4ef432ceee9afd3a41bd582c506cf8f (diff)
downloadguix-d020821c0bd2206a5f3d4db155f2a9a3de7dc670.tar.gz
guix-d020821c0bd2206a5f3d4db155f2a9a3de7dc670.zip
Revert "import: cpan: Adapt for the change to guile-json version 3."
This reverts commit 01ce7af25add55514f737af48ea6c127bedfde67.
-rw-r--r--guix/import/cpan.scm30
-rw-r--r--tests/cpan.scm13
2 files changed, 19 insertions, 24 deletions
diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index 0be37e715e..ec86f11743 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -34,7 +34,7 @@
#:use-module (guix ui)
#:use-module ((guix download) #:select (download-to-store url-fetch))
#:use-module ((guix import utils) #:select (factorize-uri
- flatten hash-ref*))
+ flatten assoc-ref*))
#:use-module (guix import json)
#:use-module (guix packages)
#:use-module (guix upstream)
@@ -76,8 +76,8 @@
;; ssleay
;; sun
("zlib" 'zlib)
- ((x) (string->license x))
- ((lst ...) `(list ,@(map string->license lst)))
+ (#(x) (string->license x))
+ (#(lst ...) `(list ,@(map string->license lst)))
(_ #f)))
(define (module->name module)
@@ -88,11 +88,11 @@
"Return the base distribution module for a given module. E.g. the 'ok'
module is distributed with 'Test::Simple', so (module->dist-name \"ok\") would
return \"Test-Simple\""
- (hash-ref (json-fetch (string-append
- "https://fastapi.metacpan.org/v1/module/"
- module
- "?fields=distribution"))
- "distribution"))
+ (assoc-ref (json-fetch (string-append
+ "https://fastapi.metacpan.org/v1/module/"
+ module
+ "?fields=distribution"))
+ "distribution"))
(define (package->upstream-name package)
"Return the CPAN name of PACKAGE."
@@ -122,12 +122,12 @@ or #f on failure. MODULE should be e.g. \"Test::Script\""
(define (cpan-source-url meta)
"Return the download URL for a module's source tarball."
(regexp-substitute/global #f "http[s]?://cpan.metacpan.org"
- (hash-ref meta "download_url")
+ (assoc-ref meta "download_url")
'pre "mirror://cpan" 'post))
(define (cpan-version meta)
"Return the version number from META."
- (match (hash-ref meta "version")
+ (match (assoc-ref meta "version")
((? number? version)
;; version is sometimes not quoted in the module json, so it gets
;; imported into Guile as a number, so convert it to a string.
@@ -183,7 +183,7 @@ depend on (gnu packages perl)."
"Return the `package' s-expression for a CPAN module from the metadata in
META."
(define name
- (hash-ref meta "distribution"))
+ (assoc-ref meta "distribution"))
(define (guix-name name)
(if (string-prefix? "perl-" name)
@@ -198,9 +198,7 @@ META."
(match (flatten
(map (lambda (ph)
(filter-map (lambda (t)
- (and=> (hash-ref* meta "metadata" "prereqs" ph t)
- (lambda (h)
- (hash-map->list cons h))))
+ (assoc-ref* meta "metadata" "prereqs" ph t))
'("requires" "recommends" "suggests")))
phases))
(#f
@@ -253,9 +251,9 @@ META."
,@(maybe-inputs 'propagated-inputs
(convert-inputs '("runtime")))
(home-page ,(cpan-home name))
- (synopsis ,(hash-ref meta "abstract"))
+ (synopsis ,(assoc-ref meta "abstract"))
(description fill-in-yourself!)
- (license ,(string->license (hash-ref meta "license"))))))
+ (license ,(string->license (assoc-ref meta "license"))))))
(define (cpan->guix-package module-name)
"Fetch the metadata for PACKAGE-NAME from metacpan.org, and return the
diff --git a/tests/cpan.scm b/tests/cpan.scm
index cdd6c0e76a..189dd027e6 100644
--- a/tests/cpan.scm
+++ b/tests/cpan.scm
@@ -24,8 +24,7 @@
#:use-module (guix tests)
#:use-module (guix grafts)
#:use-module (srfi srfi-64)
- #:use-module (ice-9 match)
- #:use-module (ice-9 hash-table))
+ #:use-module (ice-9 match))
;; Globally disable grafts because they can trigger early builds.
(%graft? #f)
@@ -110,16 +109,14 @@
(test-equal "source-url-http"
((@@ (guix import cpan) cpan-source-url)
- (alist->hash-table
- `(("download_url" .
- "http://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))))
+ `(("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)
- (alist->hash-table
- `(("download_url" .
- "https://cpan.metacpan.org/authors/id/T/TE/TEST/Foo-Bar-0.1.tar.gz"))))
+ `(("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")