From 223ede4e156acf9fa9ae52e81007e3c4356c4cf4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 2 Apr 2020 10:57:14 +0200
Subject: services: Accumulate builds for 'system' entries.

That way, more build requests are accumulated when running "guix system
build".

* gnu/services.scm (system-derivation): Use 'mapm/accumulate-builds'
rather than 'sequence'.
---
 gnu/services.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/services.scm')

diff --git a/gnu/services.scm b/gnu/services.scm
index e7a3a95e43..7941cd3af0 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -322,7 +322,8 @@ This is a shorthand for (map (lambda (svc) ...) %base-services)."
   "Return as a monadic value the derivation of the 'system' directory
 containing the given entries."
   (mlet %store-monad ((entries    mentries)
-                      (extensions (sequence %store-monad mextensions)))
+                      (extensions (mapm/accumulate-builds identity
+                                                          mextensions)))
     (lower-object
      (file-union "system"
                  (append entries (concatenate extensions))))))
-- 
cgit v1.2.3


From 8c88e242292db9b35b4ae6ad788a0f8f3c94bb53 Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice@waegenei.re>
Date: Sun, 5 Apr 2020 07:28:02 +0200
Subject: services: Allow modprobe to use "/etc/modprobe.d".

* gnu/services.scm (%modprobe-wrapper): Set 'MODPROBE_OPTIONS'
environment variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/services.scm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'gnu/services.scm')

diff --git a/gnu/services.scm b/gnu/services.scm
index 7941cd3af0..832d6984d8 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -580,6 +580,10 @@ ACTIVATION-SCRIPT-TYPE."
                   #~(begin
                       (setenv "LINUX_MODULE_DIRECTORY"
                               "/run/booted-system/kernel/lib/modules")
+                      ;; FIXME: Remove this crutch when the patch #40422,
+                      ;; updating to kmod 27 is merged.
+                      (setenv "MODPROBE_OPTIONS"
+                              "-C /etc/modprobe.d")
                       (apply execl #$modprobe
                              (cons #$modprobe (cdr (command-line))))))))
 
-- 
cgit v1.2.3