[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/23: import: egg: Fix updater.
From: |
guix-commits |
Subject: |
05/23: import: egg: Fix updater. |
Date: |
Mon, 4 Jul 2022 09:49:22 -0400 (EDT) |
htgoebel pushed a commit to branch wip-import-version
in repository guix.
commit 1d4cc7acf18b3e13e3921f41c44c7c449bc636f2
Author: Hartmut Goebel <h.goebel@crazy-compilers.com>
AuthorDate: Tue Jun 28 21:01:11 2022 +0200
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.
---
guix/import/egg.scm | 9 ++-------
1 file 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)
- branch wip-import-version created (now 926f9b0809), guix-commits, 2022/07/04
- 03/23: gnu: Add chicken-srfi-37., guix-commits, 2022/07/04
- 08/23: import: cpan: Remove unused exports., guix-commits, 2022/07/04
- 02/23: gnu: Add chicken-srfi-13., guix-commits, 2022/07/04
- 04/23: gnu: Add chicken-args., guix-commits, 2022/07/04
- 01/23: gnu: Add chicken-crypto-tools., guix-commits, 2022/07/04
- 05/23: import: egg: Fix updater.,
guix-commits <=
- 06/23: import: github: Fix updater., guix-commits, 2022/07/04
- 07/23: import: git: Restrict to non-github origins., guix-commits, 2022/07/04
- 09/23: updaters: issue error-message if version is given:, guix-commits, 2022/07/04
- 11/23: sourceforge: not supported, too complicate to implement., guix-commits, 2022/07/04
- 10/23: cran/bioconductor, guix-commits, 2022/07/04
- 12/23: gnu-maintenance (kernel.org, ftp, html, savannah, xorg, gnu), guix-commits, 2022/07/04
- 13/23: pypi:, guix-commits, 2022/07/04
- 15/23: egg, guix-commits, 2022/07/04
- 16/23: hexpm, guix-commits, 2022/07/04
- 14/23: crate, guix-commits, 2022/07/04