From daa0dda76ddd869c8b2866fcf2866667b69461ad Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 18 Dec 2020 22:20:23 +0100 Subject: nongnu: Adapt linux-initrd to populate-store changes. Fixes https://gitlab.com/nonguix/nonguix/-/issues/81. Reported-by: Jean-Baptiste Volatier. Depends on https://git.savannah.gnu.org/cgit/guix.git/commit/?id=d88ff09. * nonguix/modules.scm (import-nonguix-module?): New variable. Export it instead of nonguix-module-name?. * nongnu/system/linux-initrd.scm (microcode-initrd): Use import-nonguix-module? instead of nonguix-module-name?. (combined-initrd): Dito. --- nongnu/system/linux-initrd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nongnu') diff --git a/nongnu/system/linux-initrd.scm b/nongnu/system/linux-initrd.scm index 460d48d..5b29235 100644 --- a/nongnu/system/linux-initrd.scm +++ b/nongnu/system/linux-initrd.scm @@ -46,7 +46,7 @@ MICROCODE-PACKAGES, in the format expected by the kernel." '((gnu build linux-initrd) (guix build utils) (nonguix build utils)) - #:select? nonguix-module-name?) + #:select? import-nonguix-module?) #~(begin (use-modules (gnu build linux-initrd) (guix build utils) @@ -84,7 +84,7 @@ MICROCODE-PACKAGES, in the format expected by the kernel." (with-imported-modules (source-module-closure '((guix build utils) (nonguix build utils)) - #:select? nonguix-module-name?) + #:select? import-nonguix-module?) #~(begin (use-modules (guix build utils) (nonguix build utils)) -- cgit v1.2.3