GNU bug report logs - #62103
[PATCH 0/2] redundant system degexp

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 62103 in the body.
You can then email your comments to 62103 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: guix-patches <at> gnu.org
Cc: Bruno Victal <mirai <at> makinata.eu>
Subject: [PATCH 0/2] redundant system degexp
Date: Fri, 10 Mar 2023 20:16:07 +0000

I tested these changes with:
  make check-system TESTS=basic
  make check-system TESTS=nss-mdns

Bruno Victal (2):
  system: Simplify nsswitch binding.
  system: Remove redundant gexp-ungexp usage.

 gnu/system.scm | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)


base-commit: f7682c247504d252cf86b274ffe7b8f62670b497
-- 
2.39.1

Message #8 received at 62103 <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: 62103 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Bruno Victal <mirai <at> makinata.eu>
Subject: [PATCH 1/2] system: Simplify nsswitch binding.
Date: Fri, 10 Mar 2023 20:21:21 +0000

* gnu/system.scm (operating-system-etc-service): Simplify nsswitch binding.
---
 gnu/system.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index bb26d7c9a5..2947d1321f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1001,10 +1001,9 @@ (define* (operating-system-etc-service os)
 
          (hurd       (operating-system-hurd os))
          (issue      (plain-file "issue" (operating-system-issue os)))
-         (nsswitch   (operating-system-name-service-switch os))
-         (nsswitch   (and nsswitch
-                          (plain-file "nsswitch.conf"
-                                      (name-service-switch->string nsswitch))))
+         (nsswitch   (and=> (operating-system-name-service-switch os)
+                            (compose (cut plain-file "nsswitch.conf" <>)
+                                     name-service-switch->string)))
          (sudoers    (operating-system-sudoers-file os))
 
         ;; Startup file for POSIX-compliant login shells, which set system-wide

base-commit: f7682c247504d252cf86b274ffe7b8f62670b497
-- 
2.39.1

Message #11 received at 62103 <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: 62103 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, Bruno Victal <mirai <at> makinata.eu>
Subject: [PATCH 2/2] system: Remove redundant gexp-ungexp usage.
Date: Fri, 10 Mar 2023 20:21:22 +0000

* gnu/system.scm (os-release): Convert to variable.
(operating-system-etc-service): Remove redundant gexp-ungexps.
---
 gnu/system.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 2947d1321f..887e537b48 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -967,9 +967,8 @@ (define (validated-sudoers-file file)
                                "--check" "--file" #$file)
                        (copy-file #$file #$output)))))
 
-(define (os-release)
-  (plain-file "os-release"
-              "\
+(define os-release
+  (plain-file "os-release" "\
 NAME=\"Guix System\"
 ID=guix
 PRETTY_NAME=\"Guix System\"
@@ -1092,15 +1091,15 @@ (define* (operating-system-etc-service os)
   source /run/current-system/profile/etc/profile.d/bash_completion.sh
 fi\n")))
     (etc-service
-     `(("os-release" ,#~#$(os-release))
+     `(("os-release" ,os-release)
        ("services" ,(file-append net-base "/etc/services"))
        ("protocols" ,(file-append net-base "/etc/protocols"))
        ("rpc" ,(file-append net-base "/etc/rpc"))
-       ("login.defs" ,#~#$login.defs)
-       ("issue" ,#~#$issue)
-       ,@(if nsswitch `(("nsswitch.conf" ,#~#$nsswitch)) '())
-       ("profile" ,#~#$profile)
-       ("bashrc" ,#~#$bashrc)
+       ("login.defs" ,login.defs)
+       ("issue" ,issue)
+       ,@(if nsswitch `(("nsswitch.conf" ,nsswitch)) '())
+       ("profile" ,profile)
+       ("bashrc" ,bashrc)
        ;; Write the operating-system-host-name to /etc/hostname to prevent
        ;; NetworkManager from changing the system's hostname when connecting
        ;; to certain networks.  Some discussion at
-- 
2.39.1

Message #16 received at 62103-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Bruno Victal <mirai <at> makinata.eu>
Cc: 62103-done <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] system: Remove redundant gexp-ungexp usage.
Date: Mon, 13 Mar 2023 12:30:08 +0100

Hi Bruno,

Bruno Victal <mirai <at> makinata.eu> skribis:

> * gnu/system.scm (os-release): Convert to variable.
> (operating-system-etc-service): Remove redundant gexp-ungexps.

[...]

> * gnu/system.scm (operating-system-etc-service): Simplify nsswitch binding.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.