me/guix
Archived
1
0
Fork 0
Code Activity

services: nix: Move nix.conf generation to etc-service-type.

Browse source 
/etc/nix/nix.conf is a static file doesn't need rebuild on every boot.

* gnu/services/nix.scm (nix-activation): Don't create /etc/nix/nix.conf.
(nix-service-etc): New function.
(nix-service-type): New service-extension "nix-service-etc" to etc-service-type.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
Zhu Zihao 2020-12-06 16:26:02 +08:00 • committed by 宋文武
parent 063f6dfc37
commit 8e73bf754f
No known key found for this signature in database
GPG key ID: D415BF253B515976
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
gnu/services/nix.scm
View file

@ -89,37 +89,41 @@ GID."
(id 40000)) (id 40000))
(nix-build-accounts 10 #:group "nixbld"))) (nix-build-accounts 10 #:group "nixbld")))
(define nix-activation (define (nix-activation _)
;; Return the activation gexp. ;; Return the activation gexp.
#~(begin
(use-modules (guix build utils)
(srfi srfi-26))
(for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log"
"/nix/var/nix/gcroots/per-user"
"/nix/var/nix/profiles/per-user"))
(chown "/nix/store"
(passwd:uid (getpw "root")) (group:gid (getpw "nixbld01")))
(chmod "/nix/store" #o775)
(for-each (cut chmod <> #o777) '("/nix/var/nix/profiles"
"/nix/var/nix/profiles/per-user"))))
(define nix-service-etc
(match-lambda (match-lambda
(($ <nix-configuration> package sandbox build-sandbox-items extra-config) (($ <nix-configuration> package sandbox build-sandbox-items extra-config)
(with-imported-modules (source-module-closure (let ((ref-file (references-file package)))
'((guix build store-copy))) `(("nix/nix.conf"
#~(begin ,(computed-file
(use-modules (guix build utils) "nix.conf"
(ice-9 format) #~(begin
(srfi srfi-1) (use-modules (srfi srfi-26)
(srfi srfi-26)) (ice-9 format))
(for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log" (with-output-to-file #$output
"/nix/var/nix/gcroots/per-user" (lambda _
"/nix/var/nix/profiles/per-user")) (define internal-sandbox-paths
(chown "/nix/store" (call-with-input-file #$ref-file read))
(passwd:uid (getpw "root")) (group:gid (getpw "nixbld01")))
(chmod "/nix/store" #o775) (format #t "sandbox = ~a~%" (if #$sandbox "true" "false"))
(for-each (cut chmod <> #o777) '("/nix/var/nix/profiles" ;; config.nix captures store file names.
"/nix/var/nix/profiles/per-user")) (format #t "build-sandbox-paths = ~{~a ~}~%"
(mkdir-p "/etc/nix") (append internal-sandbox-paths
(with-output-to-file "/etc/nix/nix.conf" '#$build-sandbox-items))
(lambda _ (for-each (cut display <>) '#$extra-config)))))))))))
(format #t "sandbox = ~a~%" (if #$sandbox "true" "false"))
;; config.nix captures store file names.
(format #t "build-sandbox-paths = ~{~a ~}~%"
(append (append-map (cut call-with-input-file <> read)
'#$(map references-file
(list package)))
'#$build-sandbox-items))
(for-each (cut display <>) '#$extra-config)
(newline))))))))
(define nix-shepherd-service (define nix-shepherd-service
;; Return a <shepherd-service> for Nix. ;; Return a <shepherd-service> for Nix.
@ -143,6 +147,7 @@ GID."
(list (service-extension shepherd-root-service-type nix-shepherd-service) (list (service-extension shepherd-root-service-type nix-shepherd-service)
(service-extension account-service-type nix-accounts) (service-extension account-service-type nix-accounts)
(service-extension activation-service-type nix-activation) (service-extension activation-service-type nix-activation)
(service-extension etc-service-type nix-service-etc)
(service-extension profile-service-type (service-extension profile-service-type
(compose list nix-configuration-package)))) (compose list nix-configuration-package))))
(description "Run the Nix daemon.") (description "Run the Nix daemon.")