From 0d4b1afb6bfa4bdeade2cb6409ece9467d513e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Nov 2020 17:36:34 +0100
Subject: [PATCH 1/4] gnu: guix: Update to 1.2.0rc2.
---
gnu/packages/package-management.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 7e6f98862d..32c47854eb 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -130,9 +130,9 @@
;; 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")
- (revision 1))
+ (let ((version "1.2.0rc2")
+ (commit "207c3c594e22b678ddcea8ebc78f19b839612187")
+ (revision 0))
(package
(name "guix")
@@ -148,7 +148,7 @@
(commit commit)))
(sha256
(base32
- "1wa67gdipmzqr400hp0cw5ih0rlfvj345h65rqbk9s4g3bkg38hm"))
+ "1ggzlpam6hmfylxlm15658znafxq58bjkbbxp2nsvrvgmzqmh1km"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
From 1d21204485b21b683ec117b361157b1d169da0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 18 Nov 2020 17:36:54 +0100
Subject: [PATCH 2/4] gnu: guix: Update to 0d4b1af.
---
gnu/packages/package-management.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 32c47854eb..b14febfcd3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -131,8 +131,8 @@
;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this.
(let ((version "1.2.0rc2")
- (commit "207c3c594e22b678ddcea8ebc78f19b839612187")
- (revision 0))
+ (commit "0d4b1afb6bfa4bdeade2cb6409ece9467d513e39")
+ (revision 1))
(package
(name "guix")
@@ -148,7 +148,7 @@
(commit commit)))
(sha256
(base32
- "1ggzlpam6hmfylxlm15658znafxq58bjkbbxp2nsvrvgmzqmh1km"))
+ "1d0pifzrr14f1n0fn21rlh0hzfjvfsavf9as1vcjga47bdjjvrpp"))
(file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
From 0ae9bbe4f5f89e6f597bdb1f6df646fc5f504876 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Wed, 18 Nov 2020 22:31:32 +0100
Subject: [PATCH 3/4] services: SDDM: Wait for elogind before starting.
Fixes <https://bugs.gnu.org/44669>.
* gnu/services/sddm.scm (sddm-shepherd-service)[requirement]: Add elogind.
---
gnu/services/sddm.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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)))))
From 0a47ff9f9fe976033001bc1d881917d91f3b90a3 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Mon, 16 Nov 2020 18:56:16 +0100
Subject: [PATCH 4/4] services: base: Re-export %default-substitute-urls from
(guix store).
* gnu/services/base.scm: Export %DEFAULT-SUBSTITUTE-URLS.
---
gnu/services/base.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index e1892f3e48..05c7bec01b 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