[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: DRAFT installer: Use a Guile-Newt snapshot that supports 'form-wa
From: |
guix-commits |
Subject: |
03/04: DRAFT installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'. |
Date: |
Wed, 22 Jan 2020 17:13:41 -0500 (EST) |
civodul pushed a commit to branch wip-installer-test
in repository guix.
commit def0ac55542d17eca7593aa22b51960724438f09
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Jan 22 22:51:20 2020 +0100
DRAFT installer: Use a Guile-Newt snapshot that supports 'form-watch-fd'.
DRAFT: Skip this patch if/when the 'guile-newt' package includes this.
* gnu/installer.scm (guile-newt): New variable.
---
gnu/installer.scm | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1676a91..17385c7 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <address@hidden>
-;;; Copyright © 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -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 packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
@@ -279,6 +281,24 @@ selected keymap."
((installer-final-page current-installer)
result prev-steps))))))))
+(define guile-newt
+ ;; Guile-Newt with 'form-watch-fd'.
+ (let ((commit "b3c885d42cfac327d3531c9d064939514ce6bf12")
+ (revision "1"))
+ (package
+ (inherit 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/civodul/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