diff options
| author | Cyril Roelandt <tipecaml@gmail.com> | 2015-10-12 01:03:25 +0200 |
|---|---|---|
| committer | Cyril Roelandt <tipecaml@gmail.com> | 2015-11-03 21:38:13 +0100 |
| commit | d8bdd38201328b95d849dc95073f842db6eb3b8d (patch) | |
| tree | a8807b55d21649d36bea312299e5757ddb9b8d9e | |
| parent | 3009334e3b3c148d7a36c76952fbb32addfa2c07 (diff) | |
| download | guix-d8bdd38201328b95d849dc95073f842db6eb3b8d.tar guix-d8bdd38201328b95d849dc95073f842db6eb3b8d.tar.gz | |
import: pypi: Use "pypi-uri" instead of building the URL manually.
* guix/import/pypi.scm (make-pypi-sexp): Use "pypi-uri".
* tests/pypi.scm: Update the tests accordingly.
| -rw-r--r-- | guix/import/pypi.scm | 2 | ||||
| -rw-r--r-- | tests/pypi.scm | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index d04a68524d..647ef615e0 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -165,7 +165,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (version ,version) (source (origin (method url-fetch) - (uri (string-append ,@(factorize-uri source-url version))) + (uri (pypi-uri ,name version)) (sha256 (base32 ,(guix-hash-url temp))))) diff --git a/tests/pypi.scm b/tests/pypi.scm index c772474b82..960b8cd32a 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -84,8 +84,7 @@ baz > 13.37") ('version "1.0.0") ('source ('origin ('method 'url-fetch) - ('uri ('string-append "https://example.com/foo-" - 'version ".tar.gz")) + ('uri (pypi-uri "foo" version)) ('sha256 ('base32 (? string? hash))))) |