From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wNo6IDDLFGGQFwAAgWs5BA (envelope-from ) for ; Thu, 12 Aug 2021 09:18:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WNj0GzDLFGHkTAAA1q6Kng (envelope-from ) for ; Thu, 12 Aug 2021 07:18:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C34A19515 for ; Thu, 12 Aug 2021 09:18:07 +0200 (CEST) Received: from localhost ([::1]:55356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mE4yc-0002v3-Mh for larch@yhetil.org; Thu, 12 Aug 2021 03:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mE4yY-0002ue-99 for guix-patches@gnu.org; Thu, 12 Aug 2021 03:18:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mE4yY-0007kP-0z for guix-patches@gnu.org; Thu, 12 Aug 2021 03:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mE4yX-0004BK-Sb for guix-patches@gnu.org; Thu, 12 Aug 2021 03:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50022] [PATCH] build-system: chicken: Add 'egg-uri' procedure. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Aug 2021 07:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50022 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50022@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162875265316035 (code B ref -1); Thu, 12 Aug 2021 07:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Aug 2021 07:17:33 +0000 Received: from localhost ([127.0.0.1]:37324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mE4y4-0004AZ-QV for submit@debbugs.gnu.org; Thu, 12 Aug 2021 03:17:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:42848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mE4y3-0004AS-JM for submit@debbugs.gnu.org; Thu, 12 Aug 2021 03:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mE4y3-0002sh-Di for guix-patches@gnu.org; Thu, 12 Aug 2021 03:17:31 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45912 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mE4y1-0007F7-5t for guix-patches@gnu.org; Thu, 12 Aug 2021 03:17:30 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1628752641; bh=ujarvoKL37YMkIYTw4YcryE3qE/WP7yBAWHHCzqEWzw=; h=From:To:Subject:Date; b=OXcdFl7oBUrBTAAu49c90UJ3NyX6bXUJp9Cj1XbocnELLL51kvyyQWMc9P3cEo9G3 Bo4ZDXifaz8m2TxGMXFbkN7LZjIVfmfqOLF7GfVy+TkYe3r9pYiveOockka9PlEfnC +MX3vkiMcTBWn4DXHfWMFxAOqXXfLbjzQ5LQ8A0A= Message-Id: <75a9a5c031d7e8efe2595cfd16265ada468be0c9.1628752614.git.public@yoctocell.xyz> Date: Thu, 12 Aug 2021 09:17:20 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 18 X-Spam_score: 1.8 X-Spam_bar: + X-Spam_report: (1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=0.374, PDS_OTHER_BAD_TLD=1.997, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628752688; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ZCiPMEKnc4TxhKpNTr6wv+j87Q3ZYHaxUjv33yEfuSw=; b=n0/5UW2tg1QMIe8L6OkkZioweXzmhuaD4oWER3RX2RZbbZV9lK3xa+PfnCwWp+gEO/sq3Q iFfcglhSEXwAWgVo1OTW6pvGPikvcrd/hIhAq6XoYcCYAhI3s/c9j9yiNyBal5M1T0/sa4 heWaajhWMfmyT2K3aR2atns2jquKfs4hAa9H0c2TBPljNAevHcbePqUAqvAQpp+qcq4RlG Z0NmV9NBzLe1Dm+y4H+DwUe4Xx5Y2GtWjuiRAvXQupxryH3GGoeO4X7nqowwe8fJ9EpV1c zpwVkNzmPR2tR85pn/+Waoy5kFV1WSoueBqNDvQBwq72YOz5PbL00IOpE15W+A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628752688; a=rsa-sha256; cv=none; b=r/F1nKHLktl3dl3l6cp95Fl/T4cdefaI84QWDopdiA3arzqbChnXJlpurc2bLXQer5eGs/ wfuei/PeixL3xnIO+dIt0gRO5Rx1I5yxyufdt6mptuU7xWaw+MLLTV2k9xGu/CqoRGgAfi 9Abn4/UGk/SOfYp3LnG9UTe2UzLOFy8/hvygNCKE3mLKMKJFWSvKIMQ+PEoXMHmdxoysA5 IVqMa4hV0aGgT+AjguNVDhoN0dQE/4vwvPrYgkExX5JIrkF9HxxAEt4QFArfJtE6pOg1o/ 8vizh55kBj9sJzm/Iz6Bq1B4ZDhpu5nr6oNUxmRDOpYc1sA2liC+2H84mRax/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=OXcdFl7o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=OXcdFl7o; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C34A19515 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: DN6TRqIzKhJy Once Chicken 6 gets released, we can just adjust the URL in the =E2=80=98eg= g-uri=E2=80=99 procedure, instead of having to change the URL for all the Chicken packages. Making things a little more future-proof. * guix/build-system/chicken.scm (egg-uri): New procedure. * guix/import/egg.scm (egg-source-url): Adjust accordingly. (egg->guix-package): Likewise. --- guix/build-system/chicken.scm | 10 +++++++++- guix/import/egg.scm | 5 +++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index 9abae0431a..10f1469e88 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2020 raingloom +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,14 @@ #:use-module (ice-9 match) #:export (%chicken-build-system-modules chicken-build - chicken-build-system)) + chicken-build-system + egg-uri)) + +(define* (egg-uri name version #:optional (extension ".tar.gz")) + "Return a URI string for the CHICKEN egg corresponding to NAME and VERSI= ON. +EXTENSION is the file name extension, such as '.tar.gz'." + (string-append "https://code.call-cc.org/egg-tarballs/5/" + name "/" name "-" version extension)) =20 (define %chicken-build-system-modules ;; Build-side modules imported and used by default. diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 107894ddcf..89e7a9160d 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -87,7 +87,7 @@ (define (egg-source-url name version) "Return the URL to the source tarball for version VERSION of the CHICKEN= egg NAME." - (string-append (%eggs-url) "/" name "/" name "-" version ".tar.gz")) + `(egg-uri ,name version)) =20 (define (egg-name->guix-name name) "Return the package name for CHICKEN egg NAME." @@ -197,7 +197,8 @@ not work." (tarball (if source #f (with-store store - (download-to-store store source-url))))) + (download-to-store + store (egg-uri name version)))))) =20 (define egg-home-page (string-append (%eggs-home-page) "/" name)) base-commit: e6388b48f3df21b792cd61f93fddc7274238bac6 --=20 2.32.0