diff options
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/keymap.scm | 17 | ||||
| -rw-r--r-- | gnu/installer/parted.scm | 8 |
2 files changed, 16 insertions, 9 deletions
diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm index c42b308009..83b65a0427 100644 --- a/gnu/installer/keymap.scm +++ b/gnu/installer/keymap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018, 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. @@ -79,6 +79,11 @@ "Parse FILE and return two values, the list of supported X11-KEYMAP-MODEL and X11-KEYMAP-LAYOUT records. FILE is an XML file from the X Keyboard Configuration Database, describing possible XKB configurations." + (define maybe-empty + (match-lambda + ((x) x) + (#f ""))) + (define (model m) (sxml-match m [(model @@ -108,7 +113,7 @@ Configuration Database, describing possible XKB configurations." . ,rest-variant)) (x11-keymap-variant (name name) - (description (car + (description (maybe-empty (assoc-ref rest-variant 'description))))])) (define (layout l) @@ -120,9 +125,9 @@ Configuration Database, describing possible XKB configurations." (variantList ,[variant -> v] ...)) (x11-keymap-layout (name name) - (synopsis (car + (synopsis (maybe-empty (assoc-ref rest-layout 'shortDescription))) - (description (car + (description (maybe-empty (assoc-ref rest-layout 'description))) (variants (list v ...)))] [(layout @@ -131,9 +136,9 @@ Configuration Database, describing possible XKB configurations." . ,rest-layout)) (x11-keymap-layout (name name) - (synopsis (car + (synopsis (maybe-empty (assoc-ref rest-layout 'shortDescription))) - (description (car + (description (maybe-empty (assoc-ref rest-layout 'description))) (variants '()))])) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index ad7dd6bf91..289cd660fd 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1418,9 +1418,11 @@ USER-PARTITIONS, or return nothing." (let* ((uuids (map (lambda (file) (uuid->string (read-partition-uuid file))) swap-devices))) - `((swap-devices (list ,@(map (lambda (uuid) - `(uuid ,uuid)) - uuids)))))) + `((swap-devices + (list ,@(map (lambda (uuid) + `(swap-space + (target (uuid ,uuid)))) + uuids)))))) ,@(if (null? encrypted-partitions) '() `((mapped-devices |