* [bug#45065] [PATCH] services: nix: Move nix.conf generation to etc-service-type.
@ 2020-12-06 8:30 Zhu Zihao
2020-12-06 9:57 ` 宋文武
2020-12-06 11:50 ` bug#45065: " Oleg Pykhalov
0 siblings, 2 replies; 3+ messages in thread
From: Zhu Zihao @ 2020-12-06 8:30 UTC (permalink / raw)
To: 45065
[-- Attachment #1.1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-services-nix-Move-nix.conf-generation-to-etc-service.patch --]
[-- Type: text/x-patch, Size: 4507 bytes --]
From 506968bd136dd00f7aecb7a89d4000ef56d752f9 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sun, 6 Dec 2020 16:26:02 +0800
Subject: [PATCH] services: nix: Move nix.conf generation to etc-service-type.
/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.
---
gnu/services/nix.scm | 61 ++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 28 deletions(-)
diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm
index 93f46ef71e..1aef47db0a 100644
--- a/gnu/services/nix.scm
+++ b/gnu/services/nix.scm
@@ -89,37 +89,41 @@ GID."
(id 40000))
(nix-build-accounts 10 #:group "nixbld")))
-(define nix-activation
+(define (nix-activation _)
;; 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
(($ <nix-configuration> package sandbox build-sandbox-items extra-config)
- (with-imported-modules (source-module-closure
- '((guix build store-copy)))
- #~(begin
- (use-modules (guix build utils)
- (ice-9 format)
- (srfi srfi-1)
- (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"))
- (mkdir-p "/etc/nix")
- (with-output-to-file "/etc/nix/nix.conf"
- (lambda _
- (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))))))))
+ (let ((ref-file (references-file package)))
+ `(("nix/nix.conf"
+ ,(computed-file
+ "nix.conf"
+ #~(begin
+ (use-modules (srfi srfi-26)
+ (ice-9 format))
+ (with-output-to-file #$output
+ (lambda _
+ (define internal-sandbox-paths
+ (call-with-input-file #$ref-file read))
+
+ (format #t "sandbox = ~a~%" (if #$sandbox "true" "false"))
+ ;; config.nix captures store file names.
+ (format #t "build-sandbox-paths = ~{~a ~}~%"
+ (append internal-sandbox-paths
+ '#$build-sandbox-items))
+ (for-each (cut display <>) '#$extra-config)))))))))))
(define nix-shepherd-service
;; Return a <shepherd-service> for Nix.
@@ -143,6 +147,7 @@ GID."
(list (service-extension shepherd-root-service-type nix-shepherd-service)
(service-extension account-service-type nix-accounts)
(service-extension activation-service-type nix-activation)
+ (service-extension etc-service-type nix-service-etc)
(service-extension profile-service-type
(compose list nix-configuration-package))))
(description "Run the Nix daemon.")
--
2.29.2
[-- Attachment #3: Type: text/plain, Size: 71 bytes --]
--
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp
Zihao
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#45065] [PATCH] services: nix: Move nix.conf generation to etc-service-type.
2020-12-06 8:30 [bug#45065] [PATCH] services: nix: Move nix.conf generation to etc-service-type Zhu Zihao
@ 2020-12-06 9:57 ` 宋文武
2020-12-06 11:50 ` bug#45065: " Oleg Pykhalov
1 sibling, 0 replies; 3+ messages in thread
From: 宋文武 @ 2020-12-06 9:57 UTC (permalink / raw)
To: Zhu Zihao; +Cc: 45065-done
Zhu Zihao <all_but_last@163.com> writes:
> From: Zhu Zihao <all_but_last@163.com>
> Date: Sun, 6 Dec 2020 16:26:02 +0800
> Subject: [PATCH] services: nix: Move nix.conf generation to etc-service-type.
Pushed to master, thank you!
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#45065: [PATCH] services: nix: Move nix.conf generation to etc-service-type.
2020-12-06 8:30 [bug#45065] [PATCH] services: nix: Move nix.conf generation to etc-service-type Zhu Zihao
2020-12-06 9:57 ` 宋文武
@ 2020-12-06 11:50 ` Oleg Pykhalov
1 sibling, 0 replies; 3+ messages in thread
From: Oleg Pykhalov @ 2020-12-06 11:50 UTC (permalink / raw)
To: 45065-done
[-- Attachment #1: Type: text/plain, Size: 105 bytes --]
Merged in https://git.savannah.gnu.org/cgit/guix.git/commit/?id=8e73bf754f95fac5a383b90405e741d1cf1aaeb9
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-06 16:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-06 8:30 [bug#45065] [PATCH] services: nix: Move nix.conf generation to etc-service-type Zhu Zihao
2020-12-06 9:57 ` 宋文武
2020-12-06 11:50 ` bug#45065: " Oleg Pykhalov
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.