diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
| commit | 6a2e54236e1b2c428c8fd478ee0f3bd8130703fa (patch) | |
| tree | af70155a2f474d35d90d003f8584b2d9ee0bbaa8 /guix/import/pypi.scm | |
| parent | 2cf1e37c109c8d03fae75bc84f7012f3afa956e5 (diff) | |
| parent | 3d88855dfdcc4c8ce11f494fdf9f0ac1d8eef530 (diff) | |
| download | gnu-guix-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar gnu-guix-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/pypi.scm')
| -rw-r--r-- | guix/import/pypi.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index ab7a024ee0..9b3d80a02e 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson <davet@gnu.org> ;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -56,7 +56,7 @@ (define (pypi-fetch name) "Return an alist representation of the PyPI metadata for the package NAME, or #f on failure." - (json-fetch-alist (string-append "https://pypi.org/pypi/" name "/json"))) + (json-fetch (string-append "https://pypi.org/pypi/" name "/json"))) ;; For packages found on PyPI that lack a source distribution. (define-condition-type &missing-source-error &error @@ -69,7 +69,7 @@ or #f on failure." (assoc-ref* pypi-package "info" "version")))) (or (find (lambda (release) (string=? "sdist" (assoc-ref release "packagetype"))) - releases) + (vector->list releases)) (raise (condition (&missing-source-error (package pypi-package))))))) @@ -80,7 +80,7 @@ or #f if there isn't any." (assoc-ref* pypi-package "info" "version")))) (or (find (lambda (release) (string=? "bdist_wheel" (assoc-ref release "packagetype"))) - releases) + (vector->list releases)) #f))) (define (python->package-name name) |