diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
| commit | a485a98ca8296d760251e9d870583117ac50979e (patch) | |
| tree | 792df6983c0e52403a6c3b82c804f295369a9b1d /gnu/services | |
| parent | 84d1b500f078b619daba35864c703890bd91e5c2 (diff) | |
| parent | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (diff) | |
| download | guix-a485a98ca8296d760251e9d870583117ac50979e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 3 | ||||
| -rw-r--r-- | gnu/services/cups.scm | 3 | ||||
| -rw-r--r-- | gnu/services/sddm.scm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 065e89d312..029df5ac16 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -62,7 +62,8 @@ #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:re-export (user-processes-service-type) ;backwards compatibility + #:re-export (user-processes-service-type ;backwards compatibility + %default-substitute-urls) #:export (fstab-service-type root-file-system-service file-system-service-type diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 7d2defacaa..e8957c6859 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -482,7 +482,8 @@ programs.") (package cups) "The CUPS package.") (extensions - (package-list (list cups-filters escpr hplip-minimal foomatic-filters)) + (package-list (list cups-filters epson-inkjet-printer-escpr + foomatic-filters hplip-minimal splix)) "Drivers and other extensions to the CUPS package.") (files-configuration (files-configuration (files-configuration)) diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 59f8b16985..694ad736dc 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -169,7 +169,7 @@ Relogin=" (if (sddm-configuration-relogin? config) (list (shepherd-service (documentation "SDDM display manager.") - (requirement '(user-processes)) + (requirement '(user-processes elogind)) (provision '(xorg-server display-manager)) (start #~(make-forkexec-constructor #$sddm-command)) (stop #~(make-kill-destructor))))) |