summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-05-31 22:04:15 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-06-15 09:49:13 +0200
commitd1e7ca2df8c0e0dd601079c77f67ba6828cec08a (patch)
tree669149c8fdbd0f52cff43462534c63b7926e25aa
parentb7aa3f5d2e04800b60ece895c88dd753d2c3dfcc (diff)
downloadguix-d1e7ca2df8c0e0dd601079c77f67ba6828cec08a.tar.gz
import: pypi: Always use pypi.io URL with downcased package name.
* guix/import/pypi.scm (make-pypi-sexp): Always use pypi.io URL with
downcased package name.
-rw-r--r--guix/import/pypi.scm6
1 files changed, 1 insertions, 5 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 9c72e73314..90dbe56128 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -258,11 +258,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE."
                        ;; Sometimes 'pypi-uri' doesn't quite work due to mixed
                        ;; cases in NAME, for instance, as is the case with
                        ;; "uwsgi".  In that case, fall back to a full URL.
-                       (uri ,(if (equal? (pypi-uri name version) source-url)
-                                 `(pypi-uri ,name version)
-                                 `(string-append
-                                   ,@(factorize-uri source-url version))))
-
+                       (uri (pypi-uri ,(string-downcase name) version))
                        (sha256
                         (base32
                          ,(guix-hash-url temp)))))