me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Cyril Roelandt 2015-10-12 01:03:25 +02:00
parent 3009334e3b
commit d8bdd38201
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/import/pypi.scm
View File

@ -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)))))

3
tests/pypi.scm
View File

@ -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)))))