From patchwork Mon Jun 7 11:07:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 29994 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 8CE7F27BC78; Mon, 7 Jun 2021 12:24:23 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY, 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 3725527BC78 for ; Mon, 7 Jun 2021 12:24:23 +0100 (BST) Received: from localhost ([::1]:49202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqDMk-0004sE-5Z for patchwork@mira.cbaines.net; Mon, 07 Jun 2021 07:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqD6w-0001RJ-OO for guix-patches@gnu.org; Mon, 07 Jun 2021 07:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqD6w-0007GJ-Fg for guix-patches@gnu.org; Mon, 07 Jun 2021 07:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqD6w-0001vo-5j for guix-patches@gnu.org; Mon, 07 Jun 2021 07:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48435] [PATCH v2] Start enabling substitutes from bordeaux.guix.gnu.org. References: <20210515100822.11784-1-mail@cbaines.net> In-Reply-To: <20210515100822.11784-1-mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 11:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48435@debbugs.gnu.org Received: via spool by 48435-submit@debbugs.gnu.org id=B48435.16230640607392 (code B ref 48435); Mon, 07 Jun 2021 11:08:02 +0000 Received: (at 48435) by debbugs.gnu.org; 7 Jun 2021 11:07:40 +0000 Received: from localhost ([127.0.0.1]:54543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqD6a-0001v9-9E for submit@debbugs.gnu.org; Mon, 07 Jun 2021 07:07:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:37262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqD6Y-0001v0-Fc for 48435@debbugs.gnu.org; Mon, 07 Jun 2021 07:07:39 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 1BBBE27BC78 for <48435@debbugs.gnu.org>; Mon, 7 Jun 2021 12:07:37 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cff6cefd for <48435@debbugs.gnu.org>; Mon, 7 Jun 2021 11:07:36 +0000 (UTC) From: Christopher Baines Date: Mon, 7 Jun 2021 12:07:36 +0100 Message-Id: <20210607110736.23894-1-mail@cbaines.net> X-Mailer: git-send-email 2.31.1 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 In addition to substitutes from ci.guix.gnu.org. There are more changes that can be made in the future, but these changes seem like a good start. * config-daemon.ac (guix_substitute_urls): Add https://bordeaux.guix.gnu.org. * guix/scripts/substitute.scm (%default-substitute-urls): Add http://bordeaux.guix.gnu.org. * guix/store.scm (%default-substitute-urls): Add bordeaux.guix.gnu.org. --- config-daemon.ac | 2 +- guix/scripts/substitute.scm | 3 ++- guix/store.scm | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config-daemon.ac b/config-daemon.ac index 85caee269b..5ddc740600 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -117,7 +117,7 @@ if test "x$guix_build_daemon" = "xyes"; then dnl Determine the appropriate default list of substitute URLs (GnuTLS dnl is required so we can default to 'https'.) - guix_substitute_urls="https://ci.guix.gnu.org" + guix_substitute_urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org" AC_MSG_CHECKING([for default substitute URLs]) AC_MSG_RESULT([$guix_substitute_urls]) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 44448ff3e9..3ea1c73e10 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -643,7 +643,8 @@ found." (#f ;; This can only happen when this script is not invoked by the ;; daemon. - '("http://ci.guix.gnu.org")))) + '("http://ci.guix.gnu.org" + "http://bordeaux.guix.gnu.org")))) ;; In order to prevent using large number of discovered local substitute ;; servers, limit the local substitute urls list size. diff --git a/guix/store.scm b/guix/store.scm index cf5d5eeccc..eaf422b615 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -775,7 +775,8 @@ encoding conversion errors." (map (if (false-if-exception (resolve-interface '(gnutls))) (cut string-append "https://" <>) (cut string-append "http://" <>)) - '("ci.guix.gnu.org"))) + '("ci.guix.gnu.org" + "bordeaux.guix.gnu.org"))) (define (current-user-name) "Return the name of the calling user."