From patchwork Sat Feb 26 13:02:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37464 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 A7FCA27BBEA; Sat, 26 Feb 2022 13:04:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 723F827BBE9 for ; Sat, 26 Feb 2022 13:04:47 +0000 (GMT) Received: from localhost ([::1]:51510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNwkg-0007da-It for patchwork@mira.cbaines.net; Sat, 26 Feb 2022 08:04:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNwk2-0006wi-LU for guix-patches@gnu.org; Sat, 26 Feb 2022 08:04:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNwk2-0003BF-Ca for guix-patches@gnu.org; Sat, 26 Feb 2022 08:04:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNwk2-0005XZ-7A; Sat, 26 Feb 2022 08:04:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v5 05/22] gnu: racket-minimal: Don't configure non-existant catalogs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 13:04:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53878@debbugs.gnu.org, Liliana Marie Prikler , zimoun Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxime Devos , Attila Lendvai , Malte Gerdes , raingloom , philip@philipmcgrath.com X-Debbugs-Original-Xcc: philip@philipmcgrath.com Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164588062021124 (code B ref 53878); Sat, 26 Feb 2022 13:04:06 +0000 Received: (at 53878) by debbugs.gnu.org; 26 Feb 2022 13:03:40 +0000 Received: from localhost ([127.0.0.1]:54433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwjc-0005Ud-FT for submit@debbugs.gnu.org; Sat, 26 Feb 2022 08:03:40 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:44926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwjK-0005TA-EF for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 08:03:22 -0500 Received: by mail-qt1-f178.google.com with SMTP id v3so4985076qta.11 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 05:03:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bznu0zrmYZ/IW38lGJi0vbbQr6qr5iOfSkbslRTHEQ0=; b=YzoR5IYcxl9aQ8jXxUjQq+GcLr7Hwz5Pz1ZcbGk9IxZ9dSYENHw4OIUWCJJMaRI7Y6 7k4vsWQtuDnbyVli+9XL3YrjAI3BRKAAGkS2dmN6EhjfXSdrSKSRba7rruS9Gs/mSOz9 o94ljy/EQk8RQhsv7OBUZyfK6G4O1g2KB9XJHZtpaz7imkWhQnGdwH6HrBrc2AWpk6dK DGoMQMrkxJyXDot8YH3Zrx+JCpTNjfTeuZXkfd9MvEOuxA0bj4A6Y4LOoai+oHh4F1RE WP8GamJI2dKueMQrudFSzjWxViyW60QcbwMWccpQaIpy/VsUzejndG6tsCVvROSriYKG 1lVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bznu0zrmYZ/IW38lGJi0vbbQr6qr5iOfSkbslRTHEQ0=; b=xvEkZBORtpVmSB0On1ktF3gyrYsOBF7IvkBDWDcs/LqrOVXeGuugg0pVNEPCNQLW6S 9GHuQ6NGz1QX4z/jbMz70VsEhS/7sEgbkXNo2gCpQmT4zvqdhikwM3K3ZfS8K2g4J2f4 YIrqmh7fr4gP+PfpOpEQ/Cc871Zh41bDJj+Myh6qcGU7LwMGtfwL7/ShXigMIqfbXidb 6VBa0nvnwo/+nXU6xeUl8Fudihm3JYV5UXW0yMwQ0im8mVc/Ubv5gZArwMOFXWW/VSI0 NyGNaigTFa7Kk4W+10jkVQBiEqqh399ZNRoUiwx2vVdu83Dg6ZMhuge1fOMjmzv3kKBp iFEQ== X-Gm-Message-State: AOAM531LdzQ6BJyiM3CqBPYkrbC9m6dsDfgdhSAkBxEGUTqXWFOIiDDh sspcwUnrAQzYwmM+8obzztgt/RjLPFFr8er3yJk= X-Google-Smtp-Source: ABdhPJyx/bpmRYtIiA+l3OYhnFJL9noZFZ0g/nASotf9tDDjUh6hJ3oCOTOnPkKGh3ss3rz8+PZ23A== X-Received: by 2002:ac8:7f52:0:b0:2de:3c4c:bfbc with SMTP id g18-20020ac87f52000000b002de3c4cbfbcmr10765320qtk.611.1645880596867; Sat, 26 Feb 2022 05:03:16 -0800 (PST) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id b13-20020ac85bcd000000b002d6a901ad4csm3408981qtb.73.2022.02.26.05.03.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 05:03:16 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 08:02:37 -0500 Message-Id: <20220226130254.1301333-6-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220226130254.1301333-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220226130254.1301333-1-philip@philipmcgrath.com> MIME-Version: 1.0 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 * gnu/packages/racket.scm (racket-minimal)[arguments]<#:phases>: Change 'initialize-config.rktd' to only add a release catalog when the package version is a release version. --- gnu/packages/racket.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 55514148cb..abcd9658b2 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -231,6 +231,15 @@ (define (write-racket-hash alist) (format #t "(~s . ~s)" k v))) alist) (display ")\n")) + (define maybe-release-catalog + (let ((v #$(package-version this-package))) + (if (string-match "^[0-9]+\\.[0-9]+($|\\.[0-8][0-9]*$)" + v) + `(,(string-append + "https://download.racket-lang.org/releases/" + v + "/catalog/")) + '()))) (mkdir-p "racket/etc") (with-output-to-file "racket/etc/config.rktd" (lambda () @@ -239,12 +248,8 @@ (define (write-racket-hash alist) . (#f #$(file-append (this-package-input "openssl") "/lib") #$(file-append (this-package-input "sqlite") "/lib"))) (build-stamp . "") - (catalogs - . (,(string-append - "https://download.racket-lang.org/releases/" - #$(package-version this-package) - "/catalog/") - #f)))))))) + (catalogs ,@maybe-release-catalog + #f))))))) (add-before 'configure 'chdir (lambda _ (chdir "racket/src")))