From patchwork Wed Jun 29 07:27:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 40399 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F5F627BBEA; Wed, 29 Jun 2022 08:30:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E5A5427BBE9 for ; Wed, 29 Jun 2022 08:30:18 +0100 (BST) Received: from localhost ([::1]:38718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6S9S-0000cU-38 for patchwork@mira.cbaines.net; Wed, 29 Jun 2022 03:30:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6S8G-0008IB-2e for guix-patches@gnu.org; Wed, 29 Jun 2022 03:29:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6S8F-0001ro-PI for guix-patches@gnu.org; Wed, 29 Jun 2022 03:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6S8F-0000fg-Mf for guix-patches@gnu.org; Wed, 29 Jun 2022 03:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56295] [PATCH 5/5] import: egg: Fix updater. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Jun 2022 07:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56295 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56295@debbugs.gnu.org Received: via spool by 56295-submit@debbugs.gnu.org id=B56295.16564876912484 (code B ref 56295); Wed, 29 Jun 2022 07:29:03 +0000 Received: (at 56295) by debbugs.gnu.org; 29 Jun 2022 07:28:11 +0000 Received: from localhost ([127.0.0.1]:57095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6S7P-0000dv-Gi for submit@debbugs.gnu.org; Wed, 29 Jun 2022 03:28:11 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6S7M-0000d5-24 for 56295@debbugs.gnu.org; Wed, 29 Jun 2022 03:28:08 -0400 Received: from hermia.goebel-consult.de ([79.211.184.59]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MLRI3-1oN9eb1Uv5-00IWAf for <56295@debbugs.gnu.org>; Wed, 29 Jun 2022 09:28:02 +0200 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id C307266522; Wed, 29 Jun 2022 09:27:52 +0200 (CEST) From: Hartmut Goebel Date: Wed, 29 Jun 2022 09:27:50 +0200 Message-Id: <1d4cc7acf18b3e13e3921f41c44c7c449bc636f2.1656487185.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.4 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:o72oWQWuztxDnGykmzZkMjJJQhw6jTZjT1eOnCn+GqsdqnLaNbt S9yXMdhexIoKb1b/eBH0hayetelJw6e1l3CFIM5qieDdTv0jCgdY6ESituLDRfDRo+gV4+C n7ZDagP38a5rFxE7j8cl8d0fGn9vOwFsrBs/VnedmESTvGf1XYVOtQWHm2QxUwLfdqtvkLc 0+UIisj2Nlbv2xwAbI3rg== X-UI-Out-Filterresults: notjunk:1;V03:K0:UVzrJNl+sxY=:iuOYPUcdkyqcv2QyIBvhHB xicTr0GdGPQcEut52H5c/MZ6EwTBPH9/VXRP2/Tez1adXbFr08UZZmuwkND7ukqXAOVjprGgm n9/lzTvaJZ7xkrVqtvCvAdD7pAHvNaLhMicxFJOtxEuUA2GgvFfgnv0JySZAbRd+KWOPNhU8C SFhyXet6aSqM71BTqgV/HU+BNGGBZNYZyvwN6YkGiCSZy6VTZ/PQmg6+VwZJkP0SPrCV2WEBd +QZSjJSX9PgkmwBR/LoDMnO7/ySsXVsALBqMOsuNqEAEMSmKPUhylU7AYN6GJG+FbU0sFv6JF dEBrvoeC3fDF0PlcANPtwsy7c7+X6qc1BeCM/ev0ECvfjZ1zP+z+G+gT6ev2MLk80Lto2tlLm s32jzSPbKQbORiBqWKIaib0943HSE5Z9CEmRlwx3rT9FHsnCRfDNUNcQwCcxd6WFRualZ7R9p 0mIJynmB6xgUydvz396Lk5CM9P2DTsZVPTJxwACrLP7r8hlzV6PhfDmsQeFonXTIwTNSD4pcJ 34q/lJ4xY8j6YbQhUhC8c8H0LSyeLSbPuuywVMyXP533HO3Mh4ih3T9x5O6cuoOWsgrKGfWSd nigCh3eonuYJk+koAIO16tzgfoXJGMDkkBuCuDiowv9WWdyj8JGbiyDxPqQrpA4jLS998KTPk z7wVzQlcDI+kvrlTHGkIpQlytRmf3uBbkMIB/J6hVgTf5Qd7CgBmrbqaqQo54AJEVoW7JSqG+ GIrYTfog3VHvUylurio8GMDCP3mg0se6Iq7elv1xOs3N/uLkB2mNeZeSGAw= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches '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{} 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)