Merge branch 'version-1.2.0' into master.
commit
182ea66f6f
|
@ -130,8 +130,8 @@
|
|||
;; Latest version of Guix, which may or may not correspond to a release.
|
||||
;; Note: the 'update-guix-package.scm' script expects this definition to
|
||||
;; start precisely like this.
|
||||
(let ((version "1.2.0rc1")
|
||||
(commit "3ba6ffd0dd092ae879d014e4971989f231eaa56d")
|
||||
(let ((version "1.2.0rc2")
|
||||
(commit "0d4b1afb6bfa4bdeade2cb6409ece9467d513e39")
|
||||
(revision 1))
|
||||
(package
|
||||
(name "guix")
|
||||
|
@ -148,7 +148,7 @@
|
|||
(commit commit)))
|
||||
(sha256
|
||||
(base32
|
||||
"1wa67gdipmzqr400hp0cw5ih0rlfvj345h65rqbk9s4g3bkg38hm"))
|
||||
"1d0pifzrr14f1n0fn21rlh0hzfjvfsavf9as1vcjga47bdjjvrpp"))
|
||||
(file-name (string-append "guix-" version "-checkout"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)))))
|
||||
|
|
Reference in New Issue