From patchwork Thu Dec 24 17:17:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 25927 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 105C627BC06; Thu, 24 Dec 2020 17:19:10 +0000 (GMT) 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,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 D2EE627BC05 for ; Thu, 24 Dec 2020 17:19:09 +0000 (GMT) Received: from localhost ([::1]:33018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ksUGa-0003Pr-Up for patchwork@mira.cbaines.net; Thu, 24 Dec 2020 12:19:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksUGU-0003Pe-PT for guix-patches@gnu.org; Thu, 24 Dec 2020 12:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ksUGU-00079J-F6 for guix-patches@gnu.org; Thu, 24 Dec 2020 12:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ksUGU-0003aS-BA for guix-patches@gnu.org; Thu, 24 Dec 2020 12:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH 0/3] Move some (guix scripts substitute) code to two new modules Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Dec 2020 17:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45409@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160883028113705 (code B ref -1); Thu, 24 Dec 2020 17:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2020 17:18:01 +0000 Received: from localhost ([127.0.0.1]:55950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ksUFV-0003Ys-G2 for submit@debbugs.gnu.org; Thu, 24 Dec 2020 12:18:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:55370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ksUFQ-0003Yi-P5 for submit@debbugs.gnu.org; Thu, 24 Dec 2020 12:18:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksUFQ-0003Kn-IR for guix-patches@gnu.org; Thu, 24 Dec 2020 12:17:56 -0500 Received: from mira.cbaines.net ([212.71.252.8]:58712) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ksUFO-000711-NH for guix-patches@gnu.org; Thu, 24 Dec 2020 12:17:56 -0500 Received: from localhost (188.29.98.108.threembb.co.uk [188.29.98.108]) by mira.cbaines.net (Postfix) with ESMTPSA id 5059D27BC05 for ; Thu, 24 Dec 2020 17:17:53 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 526cb6d5 for ; Thu, 24 Dec 2020 17:17:51 +0000 (UTC) User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines Date: Thu, 24 Dec 2020 17:17:48 +0000 Message-ID: <87y2hn9l8j.fsf@cbaines.net> MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 These commits are still a work in progress, but I think the changes look pretty positive. Christopher Baines (3): guix: Move narinfo code from substitute script to module. guix: Untangle (guix narinfo) from (guix scripts substitute). guix: Split (guix substitute) from (guix scripts substitute). Makefile.am | 2 + guix/narinfo.scm | 325 +++++++++++++++ guix/scripts/challenge.scm | 3 +- guix/scripts/substitute.scm | 778 +----------------------------------- guix/scripts/weather.scm | 3 +- guix/substitute.scm | 527 ++++++++++++++++++++++++ 6 files changed, 875 insertions(+), 763 deletions(-) create mode 100644 guix/narinfo.scm create mode 100644 guix/substitute.scm