unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 56295@debbugs.gnu.org
Subject: [bug#56295] [PATCH 5/5] import: egg: Fix updater.
Date: Wed, 29 Jun 2022 09:27:50 +0200	[thread overview]
Message-ID: <1d4cc7acf18b3e13e3921f41c44c7c449bc636f2.1656487185.git.h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <cover.1656487185.git.h.goebel@crazy-compilers.com>

'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)
-- 
2.30.4





  parent reply	other threads:[~2022-06-29  7:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-29  7:26 [bug#56295] [PATCH 0/5] Add some Chicken eggs and fix egg importer Hartmut Goebel
2022-06-29  7:27 ` [bug#56295] [PATCH 1/5] gnu: Add chicken-crypto-tools Hartmut Goebel
2022-06-29  7:27 ` [bug#56295] [PATCH 2/5] gnu: Add chicken-srfi-13 Hartmut Goebel
2022-06-29  7:27 ` [bug#56295] [PATCH 3/5] gnu: Add chicken-srfi-37 Hartmut Goebel
2022-07-12 21:30   ` [bug#56295] [PATCH 0/5] Add some Chicken eggs and fix egg importer Ludovic Courtès
2022-06-29  7:27 ` [bug#56295] [PATCH 4/5] gnu: Add chicken-args Hartmut Goebel
2022-06-29  7:27 ` Hartmut Goebel [this message]
2022-07-12 21:32   ` [bug#56295] [PATCH 0/5] Add some Chicken eggs and fix egg importer Ludovic Courtès
2022-07-12 21:32 ` Ludovic Courtès
2022-07-15 18:42   ` bug#56295: " Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1d4cc7acf18b3e13e3921f41c44c7c449bc636f2.1656487185.git.h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=56295@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).