diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-19 16:53:01 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-19 16:53:01 +0200 |
| commit | 7abe35febe4234609e14e169b6fcc0cbaf4c7119 (patch) | |
| tree | 5a8307a28e0c0a6aeab21ce8b9d3487229522588 /gnu/installer.scm | |
| parent | 457ded48c54ba04489cb871d3ec6bda0c59bead7 (diff) | |
| parent | 5c10d55206a4f7a9b932ff08512a4f50c1db35be (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/installer.scm')
| -rw-r--r-- | gnu/installer.scm | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index 3b69cdbdeed..79113cb0ef8 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm | |||
| @@ -301,25 +301,6 @@ selected keymap." | |||
| 301 | ((installer-final-page current-installer) | 301 | ((installer-final-page current-installer) |
| 302 | result prev-steps)))))))) | 302 | result prev-steps)))))))) |
| 303 | 303 | ||
| 304 | (define guile-newt | ||
| 305 | ;; Guile-Newt with 'form-watch-fd'. | ||
| 306 | ;; TODO: Remove once a new release is out. | ||
| 307 | (let ((commit "c3cdeb0b53ac71aedabee669f57d44563c662446") | ||
| 308 | (revision "2")) | ||
| 309 | (package | ||
| 310 | (inherit (@ (gnu packages guile-xyz) guile-newt)) | ||
| 311 | (name "guile-newt") | ||
| 312 | (version (git-version "0.0.1" revision commit)) | ||
| 313 | (source (origin | ||
| 314 | (method git-fetch) | ||
| 315 | (uri (git-reference | ||
| 316 | (url "https://gitlab.com/mothacehe/guile-newt") | ||
| 317 | (commit commit))) | ||
| 318 | (file-name (git-file-name name version)) | ||
| 319 | (sha256 | ||
| 320 | (base32 | ||
| 321 | "1gksd1lzgjjh1p9vczghg8jw995d22hm34kbsiv8rcryirv2xy09"))))))) | ||
| 322 | |||
| 323 | (define (installer-program) | 304 | (define (installer-program) |
| 324 | "Return a file-like object that runs the given INSTALLER." | 305 | "Return a file-like object that runs the given INSTALLER." |
| 325 | (define init-gettext | 306 | (define init-gettext |
| @@ -377,6 +358,7 @@ selected keymap." | |||
| 377 | (gnu installer services) | 358 | (gnu installer services) |
| 378 | (gnu installer timezone) | 359 | (gnu installer timezone) |
| 379 | (gnu installer user) | 360 | (gnu installer user) |
| 361 | (gnu installer utils) | ||
| 380 | (gnu installer newt) | 362 | (gnu installer newt) |
| 381 | ((gnu installer newt keymap) | 363 | ((gnu installer newt keymap) |
| 382 | #:select (keyboard-layout->configuration)) | 364 | #:select (keyboard-layout->configuration)) |
