diff options
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/locale.scm | 19 | ||||
| -rw-r--r-- | gnu/installer/newt/network.scm | 2 | ||||
| -rw-r--r-- | gnu/installer/services.scm | 7 |
3 files changed, 7 insertions, 21 deletions
diff --git a/gnu/installer/locale.scm b/gnu/installer/locale.scm index 2ee5eecd96..13f3a1e881 100644 --- a/gnu/installer/locale.scm +++ b/gnu/installer/locale.scm @@ -19,6 +19,7 @@ (define-module (gnu installer locale) #:use-module (gnu installer utils) + #:use-module ((gnu build locale) #:select (normalize-codeset)) #:use-module (guix records) #:use-module (json) #:use-module (srfi srfi-1) @@ -71,24 +72,6 @@ optionally, CODESET." (codeset . ,(or codeset (match:substring matches 5))) (modifier . ,(match:substring matches 7))))) -(define (normalize-codeset codeset) - "Compute the \"normalized\" variant of CODESET." - ;; info "(libc) Using gettextized software", for the algorithm used to - ;; compute the normalized codeset. - (letrec-syntax ((-> (syntax-rules () - ((_ proc value) - (proc value)) - ((_ proc rest ...) - (proc (-> rest ...)))))) - (-> (lambda (str) - (if (string-every char-set:digit str) - (string-append "iso" str) - str)) - string-downcase - (lambda (str) - (string-filter char-set:letter+digit str)) - codeset))) - (define (locale->locale-string locale) "Reverse operation of locale-string->locale." (let ((language (locale-language locale)) diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm index 0a938db103..40d85817b6 100644 --- a/gnu/installer/newt/network.scm +++ b/gnu/installer/newt/network.scm @@ -62,7 +62,7 @@ Internet and return the selected technology. For now, only technologies with (G_ "Continue") (G_ "Exit") (G_ "The install process requires Internet access but no \ -network device were found. Do you want to continue anyway?")) +network devices were found. Do you want to continue anyway?")) ((1) (raise (condition (&installer-step-break)))) diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index d1dc516568..dbac79196d 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -75,10 +75,13 @@ (packages '((specification->package "awesome")))) (desktop-environment (name "i3") - (packages '((specification->package "i3-wm")))) + (packages (map (lambda (package) + `(specification->package ,package)) + '("i3-wm" "i3status" "dmenu" "st")))) (desktop-environment (name "ratpoison") - (packages '((specification->package "ratpoison")))) + (packages '((specification->package "ratpoison") + (specification->package "xterm")))) ;; Networking. (system-service |