[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/10: self: Generated (guix config) honors %CURRENT-SYSTEM.
From: |
guix-commits |
Subject: |
10/10: self: Generated (guix config) honors %CURRENT-SYSTEM. |
Date: |
Sat, 16 Feb 2019 18:05:25 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 54eadc42d2a5ef748a7f007516cd3d56ca17c07e
Author: Ludovic Courtès <address@hidden>
Date: Sat Feb 16 23:51:01 2019 +0100
self: Generated (guix config) honors %CURRENT-SYSTEM.
Fixes <https://bugs.gnu.org/34468>.
Reported by Diego Nicola Barbato <address@hidden>.
* guix/self.scm (%config-variables): Remove %SYSTEM.
(make-config.scm): Define '%system' to (%current-system).
---
guix/self.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/guix/self.scm b/guix/self.scm
index bcf04a1..ccff9be 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -771,7 +771,7 @@ Info manual."
((_ variable rest ...)
(cons `(variable . ,variable)
(variables rest ...))))))
- (variables %localstatedir %storedir %sysconfdir %system)))
+ (variables %localstatedir %storedir %sysconfdir)))
(define* (make-config.scm #:key zlib gzip xz bzip2
(package-name "GNU Guix")
@@ -789,6 +789,7 @@ Info manual."
%guix-version
%guix-bug-report-address
%guix-home-page-url
+ %system
%store-directory
%state-directory
%store-database-directory
@@ -798,6 +799,9 @@ Info manual."
%bzip2
%xz))
+ (define %system
+ #$(%current-system))
+
#$@(map (match-lambda
((name . value)
#~(define-public #$name #$value)))
- branch master updated (8d2c3c5 -> 54eadc4), guix-commits, 2019/02/16
- 01/10: doc: '--inherit' option can be repeated., guix-commits, 2019/02/16
- 03/10: gnu: gnome-session: Use absolute paths in .desktop files., guix-commits, 2019/02/16
- 02/10: services: gdm: Remove etc service., guix-commits, 2019/02/16
- 04/10: gnu: gdm: Add links to required login-session files., guix-commits, 2019/02/16
- 07/10: gnu: gdm: Run dbus-daemon via a wrapper script., guix-commits, 2019/02/16
- 08/10: services: gdm: Make dependencies explicit., guix-commits, 2019/02/16
- 09/10: services: gdm: Allow for custom X session scripts., guix-commits, 2019/02/16
- 06/10: gnu: gdm: Simplify pre-configure phase., guix-commits, 2019/02/16
- 05/10: gnu: gdm: Use absolute path for gnome-session., guix-commits, 2019/02/16
- 10/10: self: Generated (guix config) honors %CURRENT-SYSTEM.,
guix-commits <=