From patchwork Thu Aug 12 07:17:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 32071 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 8361527BC82; Thu, 12 Aug 2021 08:18:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 43CCE27BC78 for ; Thu, 12 Aug 2021 08:18:10 +0100 (BST) Received: from localhost ([::1]:55356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mE4yf-0002v3-63 for patchwork@mira.cbaines.net; Thu, 12 Aug 2021 03:18:09 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Once Chicken 6 gets released, we can just adjust the URL in the ‘egg-uri’ 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(-) base-commit: e6388b48f3df21b792cd61f93fddc7274238bac6 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 © 2020 raingloom +;;; Copyright © 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 VERSION. +EXTENSION is the file name extension, such as '.tar.gz'." + (string-append "https://code.call-cc.org/egg-tarballs/5/" + name "/" name "-" version extension)) (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)) (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)))))) (define egg-home-page (string-append (%eggs-home-page) "/" name))