From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39729] [PATCH 2/7] installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'. Resent-Message-ID: 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> In-Reply-To: <20200221232030.27752-1-ludo@gnu.org> References: <20200221232030.27752-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39729@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= * 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 -- 2.25.1