diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-20 09:46:15 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-20 09:46:57 -0500 |
| commit | 182ea66f6f158f13c94631a70f5da47426bfb4eb (patch) | |
| tree | 4b8e32d23ea410b0e83dc1d83db9d33062daa781 /gnu | |
| parent | b4c727f1e58e908b10bebdbaa3f88adacfd9a744 (diff) | |
| parent | 0a47ff9f9fe976033001bc1d881917d91f3b90a3 (diff) | |
| download | guix-182ea66f6f158f13c94631a70f5da47426bfb4eb.tar guix-182ea66f6f158f13c94631a70f5da47426bfb4eb.tar.gz | |
Merge branch 'version-1.2.0' into master.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/package-management.scm | 6 | ||||
| -rw-r--r-- | gnu/services/base.scm | 3 | ||||
| -rw-r--r-- | gnu/services/sddm.scm | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 557f6a2579..4a6881d475 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -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 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/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))))) |