From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MH3ZKJTi9F9zdAAA0tVLHw (envelope-from ) for ; Tue, 05 Jan 2021 22:05:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iK2vJJTi9F+bIQAA1q6Kng (envelope-from ) for ; Tue, 05 Jan 2021 22:05:08 +0000 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 67C1F9402A0 for ; Tue, 5 Jan 2021 22:05:08 +0000 (UTC) Received: from localhost ([::1]:48220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuRv-00065D-Cj for larch@yhetil.org; Tue, 05 Jan 2021 17:05:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwuRq-000656-G6 for guix-patches@gnu.org; Tue, 05 Jan 2021 17:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwuRq-00080f-8S for guix-patches@gnu.org; Tue, 05 Jan 2021 17:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwuRq-0008Tq-3r for guix-patches@gnu.org; Tue, 05 Jan 2021 17:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v3 3/3] guix: Split (guix substitutes) from (guix scripts substitute). Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Jan 2021 22:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Received: via spool by 45409-submit@debbugs.gnu.org id=B45409.160988424432533 (code B ref 45409); Tue, 05 Jan 2021 22:05:02 +0000 Received: (at 45409) by debbugs.gnu.org; 5 Jan 2021 22:04:04 +0000 Received: from localhost ([127.0.0.1]:42885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuQt-0008Sf-Pw for submit@debbugs.gnu.org; Tue, 05 Jan 2021 17:04:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuQs-0008SC-26 for 45409@debbugs.gnu.org; Tue, 05 Jan 2021 17:04:02 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45999) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuQm-0007ex-U9; Tue, 05 Jan 2021 17:03:56 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41116 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kwuQm-00025v-E9; Tue, 05 Jan 2021 17:03:56 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20210104211927.14959-1-mail@cbaines.net> <20210104211927.14959-3-mail@cbaines.net> Date: Tue, 05 Jan 2021 23:03:55 +0100 In-Reply-To: <20210104211927.14959-3-mail@cbaines.net> (Christopher Baines's message of "Mon, 4 Jan 2021 21:19:27 +0000") Message-ID: <87r1mzrqgk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 45409@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.84 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 67C1F9402A0 X-Spam-Score: -2.84 X-Migadu-Scanner: scn0.migadu.com X-TUID: WGX/zcRcOH/6 Christopher Baines skribis: > This means there's a module for working with substitutes, rather than all= the > code sitting in the script. The need for this can be seen with the weathe= r and > challenge scripts, that now don't have to use code from the substitute sc= ript, > but can instead use the substitute module. > > The separation here between the actual functionality of the substitute sc= ript > and the underlying functionality used both there and elsewhere should make > maintenance easier moving forward. > > This commit just moves code, none of the code should have been changed > significantly. > > * guix/scripts/substitute.scm (%narinfo-cache-directory, %narinfo-ttl, > %narinfo-negative-ttl, %narinfo-transient-error-ttl, %unreachable-hosts, > %max-cached-connections): Move variables to (guix substitutes). > (narinfo-cache-file, cached-narinfo, cache-narinfo!, narinfo-request, at-= most, > http-multiple-get, read-to-eof, narinfo-from-file, > open-connection-for-uri/maybe, fetch-narinfos, lookup-narinfos, > lookup-narinfos/diverse, open-connection-for-uri/cached, > call-with-cached-connection): Move procedures to (guix substitutes). > (with-cached-connection): Move syntax rule to (guix substitutes). > * guix/substitutes.scm: New file. > * Makefile.am (MODULES): Add it. > * po/guix/POTFILES.in: Add 'guix/substitutes.scm'. I=E2=80=99m reluctant starting this new module while it still contains single-short-lived-process assumptions (connection caching & co.). How about proceeding like this: 1. Move =E2=80=98http-multiple-get=E2=80=99 to (guix http-client). 2. Postpone the (guix substitute) bit to a separate patch series to leave us the time to polish things a bit and removes the single-process assumptions, or just move fewer things to (guix substitutes). You could push (guix narinfo) in the meantime since I think that one is almost ready. How does that sound? Am I being too cautious? Thanks again! :-) Ludo=E2=80=99.