diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
| commit | 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714 (patch) | |
| tree | 76684e63965e9ad6e37d9d45bc3159e6c9782cd0 /gnu/installer.scm | |
| parent | 43d9ed7792808638eabb43aa6133f1d6186c520b (diff) | |
| parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
| download | guix-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar guix-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/installer.scm')
| -rw-r--r-- | gnu/installer.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm index fe2841397e..1452c4dc7e 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages package-management) #:use-module (gnu packages xorg) + #:use-module (gnu system locale) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (installer-program)) @@ -118,7 +119,7 @@ been performed at build time." (string-append #$file "/" #$name ".go"))) (let* ((supported-locales #~(supported-locales->locales - #$(local-file "installer/aux-files/SUPPORTED"))) + #+(glibc-supported-locales))) (iso-codes #~(string-append #$iso-codes "/share/iso-codes/json/")) (iso639-3 #~(string-append #$iso-codes "iso_639-3.json")) (iso639-5 #~(string-append #$iso-codes "iso_639-5.json")) @@ -291,6 +292,7 @@ selected keymap." cryptsetup dosfstools ;mkfs.fat e2fsprogs ;mkfs.ext4 + btrfs-progs kbd ;chvt guix ;guix system init call util-linux ;mkwap @@ -335,6 +337,8 @@ selected keymap." (gnu services herd) (guix i18n) (guix build utils) + ((system repl debug) + #:select (terminal-width)) (ice-9 match)) ;; Initialize gettext support so that installers can use @@ -358,6 +362,11 @@ selected keymap." (bindtextdomain "xkeyboard-config" #+(file-append xkeyboard-config "/share/locale")) + ;; Initialize 'terminal-width' in (system repl debug) + ;; to a large-enough value to make backtrace more + ;; verbose. + (terminal-width 200) + (let* ((current-installer newt-installer) (steps (#$steps current-installer))) ((installer-init current-installer)) |