From patchwork Sun Feb 27 21:29:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37533 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 CA9AC27BBEC; Sun, 27 Feb 2022 21:31:32 +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 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 6E85B27BBEB for ; Sun, 27 Feb 2022 21:31:32 +0000 (GMT) Received: from localhost ([::1]:58290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOR8d-0008Ch-J5 for patchwork@mira.cbaines.net; Sun, 27 Feb 2022 16:31:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOR8D-0007Wx-99 for guix-patches@gnu.org; Sun, 27 Feb 2022 16:31:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOR8C-0005K4-TU for guix-patches@gnu.org; Sun, 27 Feb 2022 16:31:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOR8C-0008EQ-P6 for guix-patches@gnu.org; Sun, 27 Feb 2022 16:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v7 05/24] gnu: racket-minimal: Don't configure non-existant catalogs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 21:31:04 +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: Philip McGrath , Ludovic =?utf-8?q?Court=C3=A8?= =?utf-8?q?s?= , Maxime Devos , raingloom , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164599743931535 (code B ref 53878); Sun, 27 Feb 2022 21:31:04 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 21:30:39 +0000 Received: from localhost ([127.0.0.1]:59333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR7n-0008CS-AT for submit@debbugs.gnu.org; Sun, 27 Feb 2022 16:30:39 -0500 Received: from mail-vk1-f173.google.com ([209.85.221.173]:43918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR7b-0008BS-Rz for 53878@debbugs.gnu.org; Sun, 27 Feb 2022 16:30:28 -0500 Received: by mail-vk1-f173.google.com with SMTP id n10so4228299vkm.10 for <53878@debbugs.gnu.org>; Sun, 27 Feb 2022 13:30:27 -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=iy7wy5qgxpANhyrx8IcVPlzMlPsMzrrgguU9zsUPqoY=; b=Y2ufFjFgPFEZ57PtFNP8D3UFgRh8+4B/bIstEJO5uK+klmCJ0Z2pbzNd9zWquOPsmz MUK8KkYYqAUhfQjDpgbEikWGXAx2ynWo2hB+rrRhcakl1mxI1dirgdzyiBbSK+BaWH9R 0LYPQTEqHzydW7Rcc71LldtcEwb2zSQMx6CWGt9BCcGl32lR36rl16vJIwpR1Zip00jF GsM/pR68xFJf/P09pxYmnb2opltBYn7c+Eh0UbNdMvsFP1GIgcOPHLm13xRKTaLox80t fHj6uwAYs9UR0c6n/5qv/QW0vluihaXIKde1Y4PTXawg+MklLcWSwGEhn2YJlZdZtFEv xDSg== 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=iy7wy5qgxpANhyrx8IcVPlzMlPsMzrrgguU9zsUPqoY=; b=iHEr/PgwmUIycvC7EXD/puDNIuSZwSTIPZ4bXTNTskc3kQfHroG8ubWv1jhIKHJeRt Suu2P3KyK2dpDXuK4MEgtRMMNIXyO+C8XjRTMI03gQL9wQK5K/GTn/qt2BhpRWj+QXmv tRBHNvN8Z8E4z3bKevRRbCJTxWsqXycUzFxs3Y7nTHkgn194veXqrd256gHipCu821BM gefEGJHLTdrSVOwZVncjB38EroBs/BScGcBA5F8kv/HbWZqX4zJG2yJLoncgxLAUI/OI /OTfR6cWADh0CwR/8GYw42aMWwqJmDVMakhL3pgpXLPc9Wuif7FUdNPbmWFHju/dLM8H 9JvA== X-Gm-Message-State: AOAM531864UmTskGCYATLOuOG9sPa4lx+eDMB9XbTMeLX0NS3St+DP0l ZXbze/SA8duNiq72ox186bWrhAHSVUS3NqZ/cK4= X-Google-Smtp-Source: ABdhPJzDkRDJWM0CwYvatkGISwFW8uaEcHilUGyBkbhtHw/Jg7WOf04i0MkclaEnzDTmow4HYf/0/g== X-Received: by 2002:a1f:1355:0:b0:333:40fd:64ce with SMTP id 82-20020a1f1355000000b0033340fd64cemr908624vkt.17.1645997422381; Sun, 27 Feb 2022 13:30:22 -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 j8-20020a1fa008000000b0033190c40659sm1356958vke.37.2022.02.27.13.30.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Feb 2022 13:30:22 -0800 (PST) From: Philip McGrath Date: Sun, 27 Feb 2022 16:29:01 -0500 Message-Id: <20220227212920.2009000-6-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220227212920.2009000-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220227212920.2009000-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 eb87eaa492..dc392fb27d 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")))