Browse Source

services: nix: Fix sandbox.

* gnu/tests/package-management.scm: New file.
* gnu/local.mk: Add this.
* gnu/services/nix.scm (<nix-configuration>): New record.
(nix-activation): Generate Nix config file which fixes sandbox.
(nix-service-type): Add default value.
(nix-shepherd-service): Allow provide Nix package.
* doc/guix.texi (Miscellaneous Services)[Nix service]<nix-configuration>:
Document record.
gn-latest-20200725
Oleg Pykhalov 8 months ago
parent
commit
4656180d5d
No known key found for this signature in database GPG Key ID: 167F8EA5001AFA9C
4 changed files with 211 additions and 32 deletions
  1. +21
    -0
      doc/guix.texi
  2. +1
    -0
      gnu/local.mk
  3. +59
    -32
      gnu/services/nix.scm
  4. +130
    -0
      gnu/tests/package-management.scm

+ 21
- 0
doc/guix.texi View File

@@ -27599,6 +27599,27 @@ $ source /run/current-system/profile/etc/profile.d/nix.sh

@end defvr

@deftp {Data Type} nix-configuration
This data type represents the configuration of the Nix daemon.

@table @asis
@item @code{nix} (default: @code{nix})
The Nix package to use.

@item @code{sandbox} (default: @code{#t})
Specifies whether builds are sandboxed by default.

@item @code{build-sandbox-items} (default: @code{'()})
This is a list of strings or objects appended to the
@code{build-sandbox-items} field of the configuration file.

@item @code{extra-config} (default: @code{'()})
This is a list of strings or objects appended to the configuration file.
It is used to pass extra text to be added verbatim to the configuration
file.
@end table
@end deftp

@node Setuid Programs
@section Setuid Programs



+ 1
- 0
gnu/local.mk View File

@@ -674,6 +674,7 @@ GNU_SYSTEM_MODULES = \
%D%/tests/mail.scm \
%D%/tests/messaging.scm \
%D%/tests/networking.scm \
%D%/tests/package-management.scm \
%D%/tests/reconfigure.scm \
%D%/tests/rsync.scm \
%D%/tests/security-token.scm \


+ 59
- 32
gnu/services/nix.scm View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2019, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,7 +31,9 @@
#:use-module (guix store)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
#:use-module (guix modules)
#:export (nix-service-type))

;;; Commentary:
@@ -40,10 +42,17 @@
;;;
;;; Code:

;;;
;;; Accounts
;;;
(define-record-type* <nix-configuration>
nix-configuration make-nix-configuration
nix-configuration?
(package nix-configuration-package ;package
(default nix))
(sandbox nix-configuration-sandbox ;boolean
(default #t))
(build-sandbox-items nix-configuration-build-sandbox-items ;list of strings
(default '()))
(extra-config nix-configuration-extra-options ;list of strings
(default '())))

;; Copied from gnu/services/base.scm
(define* (nix-build-accounts count #:key
@@ -74,32 +83,50 @@ GID."
(id 40000))
(nix-build-accounts 10 #:group "nixbld")))

(define (nix-activation _)
"Return the activation gexp."
(with-imported-modules '((guix build utils))
#~(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-activation
;; Return the activation gexp.
(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))))))))

(define (nix-shepherd-service _)
"Return a <shepherd-service> for Nix."
(list
(shepherd-service
(provision '(nix-daemon))
(documentation "Run nix-daemon.")
(requirement '())
(start #~(make-forkexec-constructor
(list (string-append #$nix "/bin/nix-daemon"))))
(respawn? #f)
(stop #~(make-kill-destructor)))))
(define nix-shepherd-service
;; Return a <shepherd-service> for Nix.
(match-lambda
(($ <nix-configuration> package _ ...)
(list
(shepherd-service
(provision '(nix-daemon))
(documentation "Run nix-daemon.")
(requirement '())
(start #~(make-forkexec-constructor
(list (string-append #$package "/bin/nix-daemon"))))
(respawn? #f)
(stop #~(make-kill-destructor)))))))

(define nix-service-type
(service-type
@@ -108,7 +135,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)))
(default-value '())
(description "Run the Nix daemon.")))
(description "Run the Nix daemon.")
(default-value (nix-configuration))))

;;; nix.scm ends here

+ 130
- 0
gnu/tests/package-management.scm View File

@@ -0,0 +1,130 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.

(define-module (gnu tests package-management)
#:use-module (gnu packages base)
#:use-module (gnu packages package-management)
#:use-module (gnu services)
#:use-module (gnu services networking)
#:use-module (gnu services nix)
#:use-module (gnu system)
#:use-module (gnu system vm)
#:use-module (gnu tests)
#:use-module (guix gexp)
#:use-module (guix packages)
#:export (%test-nix))

;;; Commentary:
;;;
;;; This module provides a test definition for the nix-daemon
;;;
;;; Code:

(define* (run-nix-test name test-os)
"Run tests in TEST-OS, which has nix-daemon running."
(define os
(marionette-operating-system
test-os
#:imported-modules '((gnu services herd))))

(define vm
(virtual-machine
(operating-system os)
(port-forwardings '((8080 . 80)))
(memory-size 1024)))

(define test
(with-imported-modules '((gnu build marionette))
#~(begin
(use-modules (srfi srfi-11)
(srfi srfi-64)
(gnu build marionette)
(web client)
(web response))

(define marionette
(make-marionette (list #$vm)))

(mkdir #$output)
(chdir #$output)

(test-begin #$name)

;; XXX: Shepherd reads the config file *before* binding its control
;; socket, so /var/run/shepherd/socket might not exist yet when the
;; 'marionette' service is started.
(test-assert "shepherd socket ready"
(marionette-eval
`(begin
(use-modules (gnu services herd))
(let loop ((i 10))
(cond ((file-exists? (%shepherd-socket-file))
#t)
((> i 0)
(sleep 1)
(loop (- i 1)))
(else
'failure))))
marionette))

(test-assert "Nix daemon running"
(marionette-eval
'(begin
;; Wait for nix-daemon to be up and running.
(start-service 'nix-daemon)
(with-output-to-file "guix-test.nix"
(lambda ()
(display "\
with import <nix/config.nix>;

derivation {
system = builtins.currentSystem;
name = \"guix-test\";
builder = shell;
args = [\"-c\" \"mkdir $out\\necho FOO > $out/foo\"];
PATH = coreutils;
}
")))
(zero? (system* (string-append #$nix "/bin/nix-build")
"--substituters" "" "--debug" "--no-out-link"
"guix-test.nix")))
marionette))

(test-end)

(exit (= (test-runner-fail-count (test-runner-current)) 0)))))

(gexp->derivation (string-append name "-test") test))

(define %nix-os
;; Return operating system under test.
(let ((base-os
(simple-operating-system
(service nix-service-type)
(service dhcp-client-service-type))))
(operating-system
(inherit base-os)
(packages (cons nix (operating-system-packages base-os))))))

(define %test-nix
(system-test
(name "nix")
(description "Connect to a running nix-daemon")
(value (run-nix-test name %nix-os))))

;;; package-management.scm ends here

Loading…
Cancel
Save