me
/
guix
Archived
1
0
Fork 0
Code

system: 'operating-system-directory-base-entries' uses 'profile'. 

* gnu/system.scm (operating-system-directory-base-entries): Use a
declarative profile instead of 'profile-derivation'.
master
Ludovic Courtès 2020-04-22 15:51:26 +02:00
parent ef674a24c5
commit cda751105e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Chris Marusich <cmmarusich@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) (define* (operating-system-directory-base-entries os)
"Return the basic entries of the 'system' directory of OS for use as the "Return the basic entries of the 'system' directory of OS for use as the
value of the SYSTEM-SERVICE-TYPE service." value of the SYSTEM-SERVICE-TYPE service."
(let ((locale (operating-system-locale-directory os))) (let* ((locale (operating-system-locale-directory os))
(mlet* %store-monad ((kernel -> (operating-system-kernel os)) (kernel (operating-system-kernel os))
(modules -> (modules (operating-system-kernel-loadable-modules os))
(operating-system-kernel-loadable-modules os)) (kernel (profile
(kernel (content (packages->manifest
(profile-derivation (cons kernel
(packages->manifest (map (lambda (module)
(cons kernel (if (package? module)
(map (lambda (module) (package-for-kernel kernel
(if (package? module) module)
(package-for-kernel kernel module) module))
module)) modules))))
modules))) (hooks (list linux-module-database))))
#:hooks (list linux-module-database))) (initrd (operating-system-initrd-file os))
(initrd -> (operating-system-initrd-file os)) (params (operating-system-boot-parameters-file os)))
(params -> (operating-system-boot-parameters-file os))) (with-monad %store-monad
(return `(("kernel" ,kernel) (return `(("kernel" ,kernel)
("parameters" ,params) ("parameters" ,params)
("initrd" ,initrd) ("initrd" ,initrd)