diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-11-15 13:32:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-11-18 23:37:44 +0100 |
| commit | 46c296dcc4817f15a4b4ef7e5ef622306b4db62e (patch) | |
| tree | 3d4ce8d6ff27295b1dbfd1ae267a50e8f339daaf /gnu/bootloader/extlinux.scm | |
| parent | b297934437932de730432629b361fcb422accbb7 (diff) | |
bootloader: De-monadify configuration file generators.
* gnu/bootloader/extlinux.scm: Remove unneeded imports.
(extlinux-configuration-file): Use 'computed-file' instead of
'gexp->derivation'.
* gnu/bootloader/grub.scm (svg->png): Likewise.
(grub-background-image, eye-candy): Adjust accordingly, return
non-monadically.
(grub-configuration-file): Likewise, and use 'computed-file' instead of
'gexp->derivation'.
* gnu/bootloader/u-boot.scm: Remove unneeded imports.
* gnu/system.scm: Add 'lower-object' call.
Diffstat (limited to 'gnu/bootloader/extlinux.scm')
| -rw-r--r-- | gnu/bootloader/extlinux.scm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm index 8b7a95a6fc4..b48596c4969 100644 --- a/gnu/bootloader/extlinux.scm +++ b/gnu/bootloader/extlinux.scm | |||
| @@ -19,12 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | (define-module (gnu bootloader extlinux) | 20 | (define-module (gnu bootloader extlinux) |
| 21 | #:use-module (gnu bootloader) | 21 | #:use-module (gnu bootloader) |
| 22 | #:use-module (gnu system) | ||
| 23 | #:use-module (gnu build bootloader) | ||
| 24 | #:use-module (gnu packages bootloaders) | 22 | #:use-module (gnu packages bootloaders) |
| 25 | #:use-module (guix gexp) | 23 | #:use-module (guix gexp) |
| 26 | #:use-module (guix monads) | ||
| 27 | #:use-module (guix records) | ||
| 28 | #:use-module (guix utils) | 24 | #:use-module (guix utils) |
| 29 | #:export (extlinux-bootloader | 25 | #:export (extlinux-bootloader |
| 30 | extlinux-bootloader-gpt)) | 26 | extlinux-bootloader-gpt)) |
| @@ -78,7 +74,7 @@ TIMEOUT ~a~%" | |||
| 78 | (format port "~%")) | 74 | (format port "~%")) |
| 79 | #~()))))) | 75 | #~()))))) |
| 80 | 76 | ||
| 81 | (gexp->derivation "extlinux.conf" builder)) | 77 | (computed-file "extlinux.conf" builder)) |
| 82 | 78 | ||
| 83 | 79 | ||
| 84 | 80 | ||
