[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/104: linux-initrd: Silence Guile warnings.
From: |
guix-commits |
Subject: |
36/104: linux-initrd: Silence Guile warnings. |
Date: |
Sun, 17 May 2020 11:36:34 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit ba45d9883d77fff422d538c500d5819062292c21
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri May 15 22:34:14 2020 +0200
linux-initrd: Silence Guile warnings.
Previously, since the switch to Guile 3, we'd see this warning repeated
several times at boot time:
WARNING: …: imported module (guix build utils) overrides core binding
`delete'
* gnu/system/linux-initrd.scm (raw-initrd): In gexp, #:hide 'delete'
from (guix build utils). Wrap 'boot-system' in 'parameterize'.
---
gnu/system/linux-initrd.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index c43d53a..0971ec2 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2017, 2019 Mathieu Othacehe <address@hidden>
@@ -197,7 +197,7 @@ upon error."
#~(begin
(use-modules (gnu build linux-boot)
(gnu system file-systems)
- (guix build utils)
+ ((guix build utils) #:hide (delete))
(guix build bournish) ;add the 'bournish' meta-command
(srfi srfi-26)
@@ -213,18 +213,19 @@ upon error."
(set-path-environment-variable "PATH" '("bin" "sbin")
'#$helper-packages)))
- (boot-system #:mounts
- (map spec->file-system
- '#$(map file-system->spec file-systems))
- #:pre-mount (lambda ()
- (and #$@device-mapping-commands))
- #:linux-modules '#$linux-modules
- #:linux-module-directory '#$kodir
- #:keymap-file #+(and=> keyboard-layout
- keyboard-layout->console-keymap)
- #:qemu-guest-networking? #$qemu-networking?
- #:volatile-root? '#$volatile-root?
- #:on-error '#$on-error)))
+ (parameterize ((current-warning-port (%make-void-port "w")))
+ (boot-system #:mounts
+ (map spec->file-system
+ '#$(map file-system->spec file-systems))
+ #:pre-mount (lambda ()
+ (and #$@device-mapping-commands))
+ #:linux-modules '#$linux-modules
+ #:linux-module-directory '#$kodir
+ #:keymap-file #+(and=> keyboard-layout
+ keyboard-layout->console-keymap)
+ #:qemu-guest-networking? #$qemu-networking?
+ #:volatile-root? '#$volatile-root?
+ #:on-error '#$on-error))))
#:name "raw-initrd"))
(define* (file-system-packages file-systems #:key (volatile-root? #f))
- 24/104: gnu: kicad-i18n: Update to 5.1.6., (continued)
- 24/104: gnu: kicad-i18n: Update to 5.1.6., guix-commits, 2020/05/17
- 28/104: gnu: kicad-templates: Update to 5.1.6., guix-commits, 2020/05/17
- 34/104: utils: 'target-arm32?' & co. take an optional parameter., guix-commits, 2020/05/17
- 30/104: gnu: python-libmpsse: Update to 1.4.1., guix-commits, 2020/05/17
- 31/104: bootloader: grub: Refer to the native 'grub-mklayout' and font file., guix-commits, 2020/05/17
- 20/104: gnu: clamav: End snippet in truth., guix-commits, 2020/05/17
- 25/104: gnu: kicad-symbols: Update to 5.1.6., guix-commits, 2020/05/17
- 32/104: gexp: Compilers can now return lowerable objects., guix-commits, 2020/05/17
- 33/104: gexp: Add 'let-system'., guix-commits, 2020/05/17
- 35/104: vm: Use 'let-system'., guix-commits, 2020/05/17
- 36/104: linux-initrd: Silence Guile warnings.,
guix-commits <=
- 37/104: services: shepherd: Silence Guile warnings., guix-commits, 2020/05/17
- 38/104: gnu: matcha-theme: Update to 2020-05-09., guix-commits, 2020/05/17
- 39/104: gnu: papirus-icon-theme: Update to 20200430., guix-commits, 2020/05/17
- 40/104: gnu: delft-icon-theme: Update to 1.12., guix-commits, 2020/05/17
- 41/104: gnu: Add python-pytidylib., guix-commits, 2020/05/17
- 46/104: gnu: fulcrum: Update to 1.1.1., guix-commits, 2020/05/17
- 49/104: gnu: zsh-autosuggestions: Update to 0.6.4., guix-commits, 2020/05/17
- 52/104: gnu: st: Update to 0.8.3., guix-commits, 2020/05/17
- 29/104: gnu: kicad: Re-use common fields in add-ons., guix-commits, 2020/05/17
- 42/104: gnu: Add rawdog., guix-commits, 2020/05/17