diff options
author | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2020-12-18 22:20:23 +0100 |
---|---|---|
committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2020-12-22 12:56:25 +0100 |
commit | daa0dda76ddd869c8b2866fcf2866667b69461ad (patch) | |
tree | 2ab9389b3098d0e3cc965ae080af5a717bc0f063 /nonguix | |
parent | 712cdf306b09b3a5b27c0f8f42860ede196134fd (diff) |
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.
Diffstat (limited to 'nonguix')
-rw-r--r-- | nonguix/modules.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nonguix/modules.scm b/nonguix/modules.scm index 570a8bb..24d4267 100644 --- a/nonguix/modules.scm +++ b/nonguix/modules.scm @@ -15,7 +15,7 @@ (define-module (nonguix modules) #:use-module (ice-9 match) - #:export (nonguix-module-name?)) + #:export (import-nonguix-module?)) (define (nonguix-module-name? name) "Return true if NAME (a list of symbols) denotes a Guix or Nonguix module." @@ -25,3 +25,11 @@ (('nonguix _ ...) #t) (('nongnu _ ...) #t) (_ #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))))) |