diff options
author | Jelle Licht <jlicht@fsfe.org> | 2018-06-10 20:35:39 +0200 |
---|---|---|
committer | Jelle Licht <jlicht@fsfe.org> | 2018-06-10 22:15:12 +0200 |
commit | 3edf0d53a4043c30f3ff87b3b4b7b47d1bac1397 (patch) | |
tree | 6b5d908ff681825c989f57b4eb69eecb2942bf0d /guix/import/crate.scm | |
parent | 670a5e543033022a66d930d62a7dbff510f095db (diff) | |
download | patches-3edf0d53a4043c30f3ff87b3b4b7b47d1bac1397.tar patches-3edf0d53a4043c30f3ff87b3b4b7b47d1bac1397.tar.gz |
import: json: Consolidate duplicate json-fetch functionality.
* guix/import/json.scm (json-fetch): Return a list or hash table.
(json-fetch-alist): New procedure.
* guix/import/github.scm (json-fetch*): Remove.
(latest-released-version): Use json-fetch.
* guix/import/cpan.scm (module->dist-name): Use json-fetch-alist.
(cpan-fetch): Likewise.
* guix/import/crate.scm (crate-fetch): Likewise.
* guix/import/gem.scm (rubygems-fetch): Likewise.
* guix/import/pypi.scm (pypi-fetch): Likewise.
* guix/import/stackage.scm (stackage-lts-info-fetch): Likewise.
Diffstat (limited to 'guix/import/crate.scm')
-rw-r--r-- | guix/import/crate.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/import/crate.scm b/guix/import/crate.scm index a7485bb4d0..3724a457a4 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -51,7 +51,7 @@ (define (crate-kind-predicate kind) (lambda (dep) (string=? (assoc-ref dep "kind") kind))) - (and-let* ((crate-json (json-fetch (string-append crate-url crate-name))) + (and-let* ((crate-json (json-fetch-alist (string-append crate-url crate-name))) (crate (assoc-ref crate-json "crate")) (name (assoc-ref crate "name")) (version (assoc-ref crate "max_version")) @@ -63,7 +63,7 @@ string->license) '())) ;missing license info (path (string-append "/" version "/dependencies")) - (deps-json (json-fetch (string-append crate-url name path))) + (deps-json (json-fetch-alist (string-append crate-url name path))) (deps (assoc-ref deps-json "dependencies")) (input-crates (filter (crate-kind-predicate "normal") deps)) (native-input-crates |