From patchwork Fri Feb 21 23:20:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 20353 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 DCBED27BBE4; Fri, 21 Feb 2020 23:21:13 +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, 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 ESMTP id 7345B27BBEA for ; Fri, 21 Feb 2020 23:21:13 +0000 (GMT) Received: from localhost ([::1]:37172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5Hbc-0004Ge-UN for patchwork@mira.cbaines.net; Fri, 21 Feb 2020 18:21:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48098) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5HbT-0004F3-Sd for guix-patches@gnu.org; Fri, 21 Feb 2020 18:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5HbS-0008VU-Oy for guix-patches@gnu.org; Fri, 21 Feb 2020 18:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5HbS-0008VQ-MV for guix-patches@gnu.org; Fri, 21 Feb 2020 18:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5HbS-0000Wo-Je for guix-patches@gnu.org; Fri, 21 Feb 2020 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39729] [PATCH 2/7] installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2020 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39729@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 39729-submit@debbugs.gnu.org id=B39729.15823272541949 (code B ref 39729); Fri, 21 Feb 2020 23:21:02 +0000 Received: (at 39729) by debbugs.gnu.org; 21 Feb 2020 23:20:54 +0000 Received: from localhost ([127.0.0.1]:48393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5HbK-0000VM-18 for submit@debbugs.gnu.org; Fri, 21 Feb 2020 18:20:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5HbG-0000Ua-0R for 39729@debbugs.gnu.org; Fri, 21 Feb 2020 18:20:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1j5HbA-0008BM-Tp; Fri, 21 Feb 2020 18:20:44 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=40974 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1j5HbA-0000vc-3x; Fri, 21 Feb 2020 18:20:44 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 22 Feb 2020 00:20:25 +0100 Message-Id: <20200221232030.27752-2-ludo@gnu.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221232030.27752-1-ludo@gnu.org> References: <20200221232030.27752-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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/installer.scm (guile-newt): New variable. --- gnu/installer.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/installer.scm b/gnu/installer.scm index edef3fde62..6c11fa6198 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -26,6 +26,8 @@ #:use-module (guix utils) #:use-module (guix ui) #:use-module ((guix self) #:select (make-config.scm)) + #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (gnu installer utils) #:use-module (gnu packages admin) #:use-module (gnu packages base) @@ -280,6 +282,25 @@ selected keymap." ((installer-final-page current-installer) result prev-steps)))))))) +(define guile-newt + ;; Guile-Newt with 'form-watch-fd'. + ;; TODO: Remove once a new release is out. + (let ((commit "b3c885d42cfac327d3531c9d064939514ce6bf12") + (revision "1")) + (package + (inherit (@ (gnu packages guile-xyz) guile-newt)) + (name "guile-newt") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mothacehe/guile-newt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02p0bi6c05699idgx6gfkljhqgi8zf09clhzx81i8wa064s70r1y"))))))) + (define (installer-program) "Return a file-like object that runs the given INSTALLER." (define init-gettext