diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:33:09 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-18 14:37:26 +0000 |
| commit | e486b2b674badc80627b11077b7df2ac1cab92d8 (patch) | |
| tree | 5909547a69c4b185b878c8f0fe8152f1c01fef04 /guix/import | |
| parent | 0df1eb029efe5ebe3f02e36fa650cae4aaba89ec (diff) | |
| parent | 88badc074a5dbebf80115918cf6c0009075154d2 (diff) | |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/pypi.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index e2314820d0..d5035b790b 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -419,7 +419,7 @@ return the unaltered list of upstream dependency names." "Return the `package' s-expression for a python package with the given NAME, VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (define (maybe-upstream-name name) - (if (string-match ".*\\-[0-9]+" (pk name)) + (if (string-match ".*\\-[0-9]+" name) `((properties ,`'(("upstream-name" . ,name)))) '())) @@ -533,9 +533,12 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (url (distribution-url (latest-source-release pypi-package)))) (upstream-source + (urls (list url)) + (input-changes + (changed-inputs package + (pypi->guix-package pypi-name))) (package (package-name package)) - (version version) - (urls (list url)))))))) + (version version))))))) (define %pypi-updater (upstream-updater |