aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-22 15:51:26 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-26 22:49:48 +0200
commitcda751105e26c28256169ca9c267d9e2aafd6558 (patch)
tree17a09d2b3e9e576b0a32ec515717bee0ecc6cec7 /gnu/system.scm
parentef674a24c527eaf54801707d34dbf5d12ec139cb (diff)
downloadguix-cda751105e26c28256169ca9c267d9e2aafd6558.tar
guix-cda751105e26c28256169ca9c267d9e2aafd6558.tar.gz
system: 'operating-system-directory-base-entries' uses 'profile'.
* gnu/system.scm (operating-system-directory-base-entries): Use a declarative profile instead of 'profile-derivation'.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm34
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 29e622872d..3a86564fa2 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
@@ -491,22 +491,22 @@ possible (that is if there's a LINUX keyword argument in the build system)."
(define* (operating-system-directory-base-entries os)
"Return the basic entries of the 'system' directory of OS for use as the
value of the SYSTEM-SERVICE-TYPE service."
- (let ((locale (operating-system-locale-directory os)))
- (mlet* %store-monad ((kernel -> (operating-system-kernel os))
- (modules ->
- (operating-system-kernel-loadable-modules os))
- (kernel
- (profile-derivation
- (packages->manifest
- (cons kernel
- (map (lambda (module)
- (if (package? module)
- (package-for-kernel kernel module)
- module))
- modules)))
- #:hooks (list linux-module-database)))
- (initrd -> (operating-system-initrd-file os))
- (params -> (operating-system-boot-parameters-file os)))
+ (let* ((locale (operating-system-locale-directory os))
+ (kernel (operating-system-kernel os))
+ (modules (operating-system-kernel-loadable-modules os))
+ (kernel (profile
+ (content (packages->manifest
+ (cons kernel
+ (map (lambda (module)
+ (if (package? module)
+ (package-for-kernel kernel
+ module)
+ module))
+ modules))))
+ (hooks (list linux-module-database))))
+ (initrd (operating-system-initrd-file os))
+ (params (operating-system-boot-parameters-file os)))
+ (with-monad %store-monad
(return `(("kernel" ,kernel)
("parameters" ,params)
("initrd" ,initrd)