me/guix
Archived
1
0
Fork 0
Code Activity

Merge branch 'version-1.2.0' into master.

Browse source
This commit is contained in:
Maxim Cournoyer 2020-11-20 09:46:15 -05:00
commit 182ea66f6f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/package-management.scm
View file

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

3
gnu/services/base.scm
View file

@ -62,7 +62,8 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 format) #: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 #:export (fstab-service-type
root-file-system-service root-file-system-service
file-system-service-type file-system-service-type

2
gnu/services/sddm.scm
View file

@ -169,7 +169,7 @@ Relogin=" (if (sddm-configuration-relogin? config)
(list (shepherd-service (list (shepherd-service
(documentation "SDDM display manager.") (documentation "SDDM display manager.")
(requirement '(user-processes)) (requirement '(user-processes elogind))
(provision '(xorg-server display-manager)) (provision '(xorg-server display-manager))
(start #~(make-forkexec-constructor #$sddm-command)) (start #~(make-forkexec-constructor #$sddm-command))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))