diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-08 13:00:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-08 13:00:50 +0200 |
| commit | 27783023993f9272ce422868d14529159c4a5218 (patch) | |
| tree | 9013b08aa39e497b1fd8e01a05254278d83f0ff7 /gnu/installer/newt.scm | |
| parent | be1e842ad78ac6c52fc7790f4a3ffd716673c111 (diff) | |
| parent | ba6f2bda18ed19fa486a9c3e2c3baea6c66c6867 (diff) | |
| download | guix-patches-27783023993f9272ce422868d14529159c4a5218.tar guix-patches-27783023993f9272ce422868d14529159c4a5218.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/check.scm
gnu/packages/cross-base.scm
gnu/packages/gimp.scm
gnu/packages/java.scm
gnu/packages/mail.scm
gnu/packages/sdl.scm
gnu/packages/texinfo.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
Diffstat (limited to 'gnu/installer/newt.scm')
| -rw-r--r-- | gnu/installer/newt.scm | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm index 6c44b4acf6..a24a152984 100644 --- a/gnu/installer/newt.scm +++ b/gnu/installer/newt.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ #:use-module (gnu installer utils) #:use-module (gnu installer newt ethernet) #:use-module (gnu installer newt final) + #:use-module (gnu installer newt parameters) #:use-module (gnu installer newt hostname) #:use-module (gnu installer newt keymap) #:use-module (gnu installer newt locale) @@ -44,7 +45,9 @@ (define (init) (newt-init) (clear-screen) - (set-screen-size!)) + (set-screen-size!) + (push-help-line + (format #f (G_ "Press <F1> for installation parameters.")))) (define (exit) (newt-finish) @@ -91,8 +94,8 @@ problem. The backtrace is displayed below. Please report it by email to \ (define (menu-page steps) (run-menu-page steps)) -(define* (keymap-page layouts) - (run-keymap-page layouts)) +(define* (keymap-page layouts context) + (run-keymap-page layouts #:context context)) (define (network-page) (run-network-page)) @@ -109,6 +112,12 @@ problem. The backtrace is displayed below. Please report it by email to \ (define (services-page) (run-services-page)) +(define (parameters-menu menu-proc) + (newt-set-help-callback menu-proc)) + +(define (parameters-page keyboard-layout-selection) + (run-parameters-page keyboard-layout-selection)) + (define newt-installer (installer (name 'newt) @@ -125,4 +134,6 @@ problem. The backtrace is displayed below. Please report it by email to \ (user-page user-page) (partition-page partition-page) (services-page services-page) - (welcome-page welcome-page))) + (welcome-page welcome-page) + (parameters-menu parameters-menu) + (parameters-page parameters-page))) |