mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-26 12:39:36 -05:00
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.
This commit is contained in:
parent
44bb5507d6
commit
af025d99f4
1 changed files with 2 additions and 7 deletions
|
@ -85,11 +85,6 @@ (define %eggs-url
|
|||
(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 @@ (define egg-content (if file
|
|||
(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 @@ (define (latest-release package)
|
|||
"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)
|
||||
|
|
Loading…
Reference in a new issue