diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/databases.scm | 3 | ||||
| -rw-r--r-- | gnu/services/desktop.scm | 2 | ||||
| -rw-r--r-- | gnu/services/herd.scm | 8 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 45 |
4 files changed, 52 insertions, 6 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 8b1420116d..6c3b829df7 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <[email protected]> ;;; Copyright © 2015 Ludovic Courtès <[email protected]> +;;; Copyright © 2016 Leo Famulari <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,7 +57,7 @@ host all all ::1/128 trust")) (define %default-postgres-config (mixed-text-file "postgresql.conf" "hba_file = '" %default-postgres-hba "'\n" - "ident_file = '" %default-postgres-ident "\n")) + "ident_file = '" %default-postgres-ident "'\n")) (define %postgresql-accounts (list (user-group (name "postgres") (system? #t)) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index e4f0736b89..02bcf1b19f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -378,7 +378,7 @@ site} for more information." (define polkit-etc-files (match-lambda (($ <polkit-configuration> polkit packages) - `(("polkit-1" ,(polkit-directory packages)))))) + `(("polkit-1" ,(polkit-directory (cons polkit packages))))))) (define polkit-setuid-programs (match-lambda diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index a3a9bf0230..9cb33a9fd0 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -66,19 +66,19 @@ return the socket." command object." (match error (('error ('version 0 x ...) 'service-not-found service) - (report-error (_ "service '~a' could not be found") + (report-error (_ "service '~a' could not be found~%") service)) (('error ('version 0 x ...) 'action-not-found action service) - (report-error (_ "service '~a' does not have an action '~a'") + (report-error (_ "service '~a' does not have an action '~a'~%") service action)) (('error ('version 0 x ...) 'action-exception action service key (args ...)) (report-error (_ "exception caught while executing '~a' \ -on service '~a':") +on service '~a':~%") action service) (print-exception (current-error-port) #f key args)) (('error . _) - (report-error (_ "something went wrong: ~s") + (report-error (_ "something went wrong: ~s~%") error)) (#f ;not an error #t))) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index a93dbfe7c4..980b5a6ba5 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -40,6 +40,7 @@ #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:export (xorg-configuration-file + %default-xorg-modules xorg-start-command %default-slim-theme %default-slim-theme-name @@ -137,9 +138,52 @@ EndSection "\n" extra-config)) +(define %default-xorg-modules + (list xf86-video-vesa + xf86-video-fbdev + xf86-video-modesetting + xf86-video-cirrus + xf86-video-intel + xf86-video-mach64 + xf86-video-nouveau + xf86-video-nv + xf86-video-sis + xf86-input-libinput + xf86-input-evdev + xf86-input-keyboard + xf86-input-mouse + xf86-input-synaptics)) + +(define (xorg-configuration-directory modules) + "Return a directory that contains the @code{.conf} files for X.org that +includes the @code{share/X11/xorg.conf.d} directories of each package listed +in @var{modules}." + (computed-file "xorg.conf.d" + #~(begin + (use-modules (guix build utils) + (srfi srfi-1)) + + (define files + (append-map (lambda (module) + (find-files (string-append + module + "/share/X11/xorg.conf.d") + "\\.conf$")) + (list #$@modules))) + + (mkdir #$output) + (for-each (lambda (file) + (symlink file + (string-append #$output "/" + (basename file)))) + files) + #t) + #:modules '((guix build utils)))) + (define* (xorg-start-command #:key (guile (canonical-package guile-2.0)) (configuration-file (xorg-configuration-file)) + (modules %default-xorg-modules) (xorg-server xorg-server)) "Return a derivation that builds a @var{guile} script to start the X server from @var{xorg-server}. @var{configuration-file} is the server configuration @@ -158,6 +202,7 @@ Usually the X server is started by a login manager." "-logverbose" "-verbose" "-xkbdir" (string-append #$xkeyboard-config "/share/X11/xkb") "-config" #$configuration-file + "-configdir" #$(xorg-configuration-directory modules) "-nolisten" "tcp" "-terminate" ;; Note: SLiM and other display managers add the |