From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YONjCB/kGmKxVQEAgWs5BA (envelope-from ) for ; Sun, 27 Feb 2022 03:38:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yKrIBR/kGmKhGgAA9RJhRA (envelope-from ) for ; Sun, 27 Feb 2022 03:38:23 +0100 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 E6E9A1FD0E for ; Sun, 27 Feb 2022 03:38:22 +0100 (CET) Received: from localhost ([::1]:38420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO9S1-0006BC-Cg for larch@yhetil.org; Sat, 26 Feb 2022 21:38:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO9Ri-00069y-QP for guix-patches@gnu.org; Sat, 26 Feb 2022 21:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO9Ri-0006Kl-I2 for guix-patches@gnu.org; Sat, 26 Feb 2022 21:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nO9Ri-0004Dz-FB for guix-patches@gnu.org; Sat, 26 Feb 2022 21:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v6 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 02:38:02 +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=A8s?= , Maxime Devos , raingloom , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164592943116116 (code B ref 53878); Sun, 27 Feb 2022 02:38:02 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 02:37:11 +0000 Received: from localhost ([127.0.0.1]:56539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9Qt-0004Br-AP for submit@debbugs.gnu.org; Sat, 26 Feb 2022 21:37:11 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:40877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9Qs-0004Bf-0q for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 21:37:10 -0500 Received: by mail-qk1-f180.google.com with SMTP id c7so7809210qka.7 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 18:37:09 -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=qhdWaxK2B/8GZiVT+44S8xPk0GiXuviwUE1ruX+vVGs=; b=KHGrq7Eu/kU2aQQ8bVHHmF3rhUXInngPkhvfu582EwI1w1+kmi4Eyc9WCKzYmXPkuG lmJJGezU/MraXcnT2a+ufUz/RMFoatkI9IItaYwJXINgqMgLM/LX5NpkMzmcTapxdYjg 6PGiHoc9N0nDtss7k4Cjw5UKTOVfoXr+Ump1IDJSwOwyA4M5xzYAoiUFHTIY5++/lwU6 p3MiHWod9IjP20tk+/uNYJTZsi28WFcOOISHs7aN4VpMBU80ofqBna4gtj5YupBJXRX6 zX+AwB0A/OkzJDcP182gs9kCDwNvREfJFUgjYTTxnjjKcSD6w9oCQuzmXKLu361Zs5iN rSiQ== 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=qhdWaxK2B/8GZiVT+44S8xPk0GiXuviwUE1ruX+vVGs=; b=AS+/ZR87jzCFmdD4ptQVgDE1nN9Ibom8OUX0tWfrZGOpOikL6Oqh6wrLeXmll/nEui YA8+2udFlavR0fR2EI0hHANq5z98apAqaqw630wVhN6Ul6Vp9mBxRz/Aj4RkJK48dWZs djR1B+b9CjM7fKHZaCJQYUL77kzWqVc3CZ/VRH6CTCZsI2H/mIQbTxwfGWh0H59QUylU nuI9BMuY4h8ZqC0yrSo6YSbnx9YyS+vbz8c3NyA0jSnyM0D+QYNx6DtjIH6GmTAZ8vN5 HHYm0Um5bZS4eDMdJUkrdElEA1peonTG2KlyT+MPKP/UFmlq+vVR0/wkNCuqffqGVedO /Xig== X-Gm-Message-State: AOAM530LZD7O6jYpHcI7zek47j9hj6bgJwLRPIjyHF9vC06W/N7tFqYE a8sjAfwCmxXJbuoadYLk0oJQ2t/tcFRkKk5n3d8= X-Google-Smtp-Source: ABdhPJxRUlbeRdqLVC7n7lm6BmFwF+mmJpkMViZPc4lQRrJfW7BqaXJoMb1YBhCSG3TPQSQ5ePN5dQ== X-Received: by 2002:a05:620a:3713:b0:648:d836:8153 with SMTP id de19-20020a05620a371300b00648d8368153mr8408824qkb.674.1645929424495; Sat, 26 Feb 2022 18:37:04 -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 185-20020a3706c2000000b0060df89eb3ecsm3403593qkg.60.2022.02.26.18.36.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 18:37:04 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 21:34:31 -0500 Message-Id: <20220227023450.1877215-6-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220227023450.1877215-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220227023450.1877215-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645929502; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=qhdWaxK2B/8GZiVT+44S8xPk0GiXuviwUE1ruX+vVGs=; b=K3a9jJWO2VyrO/EQBVD1P5TGnlCZlCsS3OnC9bb+a3ALZ0Z2MyVDrXAwKMjUfAHHYKPQHD BibciGwugR3SC0Jj9oCY4GST+ioitU8O/N7E3yhJEdRLswDCFduwuC+enSxIZnwmMeCVhx N412aQl4NW6hIvVJl//BhjA+kOTx+mSyuAMGP3ZefTyLhYEEPH+3TLiNxngd48+E/Gyi1+ gBAieSnwpwtABYNk5ig9dUXgUAxIIPa4BgNX0pyG7RMOzqkXtC+VQfAFeh/Ev1v3ecl1yc fW9dnd/0ELsy8v0y8RdUw5q2Kp9PVtRZmZs8U+HOmTPFDXX8+9fBoiW3JdJvjA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645929502; a=rsa-sha256; cv=none; b=NVcfq9LX8ko9xieh/nh4tA+DQtCRxKJaFK8rQhQq12uMi1+STex/BaEo/2+XbWHxozuASo 9dKfdsBMhsAmJrlArQeG4riiI9DeNH9+d1AIFPrAS4jxkmzbX+DUltveVNlsq8dwzNcEGa 4v6UzCvm6I30UtpThRe5Eosy6jsb+7OtSeYYYogbl9brfpe7SDK/8qjAXiESQFMlgDG5Pj elBdZP7WFHQfwXI9fWQbQDriSt2uaV/urNo0tUsvgMZBB6T6lKmuVa6D4gkjdlDkuYrTEU GnXF7GAVTOAHJuT2swxym0YaD2VIOU+TFRRXQ/bVVh87cxCD3QHtu7F9q2z/rA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=KHGrq7Eu; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=KHGrq7Eu; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E6E9A1FD0E X-Spam-Score: 3.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: qGdhyy1Le74o * 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 55fdb28fdd..b828bbbd3d 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"))) -- 2.32.0