diff options
| author | Leo Famulari <leo@famulari.name> | 2018-10-12 23:47:15 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-10-18 23:46:33 -0400 |
| commit | 7277d06d8b956263ef1773c5f61e53dc65583ddd (patch) | |
| tree | 10a95b39642667cf76cda27378a8012d1f5a86ac | |
| parent | eed00f93e8999712191e39c59c15e23461520f43 (diff) | |
| download | guix-7277d06d8b956263ef1773c5f61e53dc65583ddd.tar.gz | |
gnu: Use pypi.org.
<pypi.io> redirects to <pypi.org>. * guix/build-system/python.scm (pypi-uri): Replace pypi.io with pypi.org. * guix/import/pypi.scm (pypi-url?): Likewise. * tests/pypi.scm: Likewise.
| -rw-r--r-- | guix/build-system/python.scm | 2 | ||||
| -rw-r--r-- | guix/import/pypi.scm | 2 | ||||
| -rw-r--r-- | tests/pypi.scm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index ffed837313..b753940bad 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -50,7 +50,7 @@ "Return a URI string for the Python package hosted on the Python Package Index (PyPI) corresponding to NAME and VERSION. EXTENSION is the file name extension, such as '.tar.gz'." - (string-append "https://pypi.io/packages/source/" + (string-append "https://pypi.org/packages/source/" (string-take name 1) "/" name "/" name "-" version extension)) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 87b047bdac..3a20fc4b9b 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -330,7 +330,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (define (pypi-url? url) (or (string-prefix? "https://pypi.org/" url) (string-prefix? "https://pypi.python.org/" url) - (string-prefix? "https://pypi.io/packages" url))) + (string-prefix? "https://pypi.org/packages" url))) (let ((source-url (and=> (package-source package) origin-uri)) (fetch-method (and=> (package-source package) origin-method))) diff --git a/tests/pypi.scm b/tests/pypi.scm index 616ec191f5..6daa44a6e7 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -81,7 +81,7 @@ baz > 13.37") (dummy-package "foo" (source (dummy-origin (uri - "https://pypi.io/packages/source/p/psutil/psutil-4.3.0.tar.gz")))))) + "https://pypi.org/packages/source/p/psutil/psutil-4.3.0.tar.gz")))))) (test-equal "guix-package->pypi-name, new URL style" "certbot" |