Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-21 16:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: Adapt linux-initrd to populate-store changes.

Browse source 
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.
This commit is contained in:
Jonathan Brielmaier 2020-12-18 22:20:23 +01:00
parent 712cdf306b
commit daa0dda76d
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nongnu/system/linux-initrd.scm
View file

@ -46,7 +46,7 @@ MICROCODE-PACKAGES, in the format expected by the kernel."
'((gnu build linux-initrd) '((gnu build linux-initrd)
(guix build utils) (guix build utils)
(nonguix build utils)) (nonguix build utils))
#:select? nonguix-module-name?) #:select? import-nonguix-module?)
#~(begin #~(begin
(use-modules (gnu build linux-initrd) (use-modules (gnu build linux-initrd)
(guix build utils) (guix build utils)
@ -84,7 +84,7 @@ MICROCODE-PACKAGES, in the format expected by the kernel."
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure
'((guix build utils) '((guix build utils)
(nonguix build utils)) (nonguix build utils))
#:select? nonguix-module-name?) #:select? import-nonguix-module?)
#~(begin #~(begin
(use-modules (guix build utils) (use-modules (guix build utils)
(nonguix build utils)) (nonguix build utils))

10
nonguix/modules.scm
View file

@ -15,7 +15,7 @@
(define-module (nonguix modules) (define-module (nonguix modules)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (nonguix-module-name?)) #:export (import-nonguix-module?))
(define (nonguix-module-name? name) (define (nonguix-module-name? name)
"Return true if NAME (a list of symbols) denotes a Guix or Nonguix module." "Return true if NAME (a list of symbols) denotes a Guix or Nonguix module."
@ -25,3 +25,11 @@
(('nonguix _ ...) #t) (('nonguix _ ...) #t)
(('nongnu _ ...) #t) (('nongnu _ ...) #t)
(_ #f))) (_ #f)))
;; Since we don't use deduplication support in 'populate-store', don't
;; import (guix store deduplication) and its dependencies, which
;; includes Guile-Gcrypt.
(define (import-nonguix-module? module)
"Return true if MODULE is not (guix store deduplication)"
(and (nonguix-module-name? module)
(not (equal? module '(guix store deduplication)))))