diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2022-06-28 21:01:11 +0200 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2022-07-15 20:17:37 +0200 |
commit | af025d99f4cd9ab6643f63f587faf0ba2d65d862 (patch) | |
tree | 1114908224e497d80d6804241f3b88d751c972ca | |
parent | 44bb5507d63b89c9d5f0c2c77af94caeec96e5e6 (diff) | |
download | guix-af025d99f4cd9ab6643f63f587faf0ba2d65d862.tar.gz guix-af025d99f4cd9ab6643f63f587faf0ba2d65d862.zip |
import: egg: Fix updater.
'egg-source-url' did not return the URL, but the quoted expression. This did
break the updater, which expects the URL as a string.
* guix/import/egg.scm(egg-source-url): Remove.
(egg->guix-package)[egg-content]: Use quoted expression directly.
(latest-release): Call egg-uri instead of egg-source-url.
-rw-r--r-- | guix/import/egg.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 0b88020554..52196583c4 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -85,11 +85,6 @@ (define %eggs-home-page (make-parameter "https://wiki.call-cc.org/egg")) -(define (egg-source-url name version) - "Return the URL to the source tarball for version VERSION of the CHICKEN egg -NAME." - `(egg-uri ,name version)) - (define (egg-name->guix-name name) "Return the package name for CHICKEN egg NAME." (string-append package-name-prefix name)) @@ -196,7 +191,7 @@ not work." (let* ((version* (or (assoc-ref egg-content 'version) (find-latest-version name))) (version (if (list? version*) (first version*) version*)) - (source-url (if source #f (egg-source-url name version))) + (source-url (if source #f `(egg-uri ,name version))) (tarball (if source #f (with-store store @@ -342,7 +337,7 @@ not work." "Return an @code{<upstream-source>} for the latest release of PACKAGE." (let* ((egg-name (guix-package->egg-name package)) (version (find-latest-version egg-name)) - (source-url (egg-source-url egg-name version))) + (source-url (egg-uri egg-name version))) (upstream-source (package (package-name package)) (version version) |