guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: Fix problems initially introduced in commit 543d971ed2, now reins


From: guix-commits
Subject: 02/03: Fix problems initially introduced in commit 543d971ed2, now reinstated.
Date: Thu, 17 Nov 2022 06:53:01 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 238248aac98daa8d455fc0c2244ba3e0175cb8b7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Nov 16 23:10:39 2022 -0500

    Fix problems initially introduced in commit 543d971ed2, now reinstated.
    
    Commit 543d971ed2 ("services: configuration: Re-order generated record
    fields") introduced two regressions, one in guix home and another one in the
    zabbix service.
    
    * gnu/home/services/shells.scm (home-bash-extensions): Remove the first
    pattern in the match, which used to be to ignore %location.
    * gnu/services/monitoring.scm (zabbix-front-end-nginx-extension): Likewise.
---
 gnu/home/services/shells.scm | 2 +-
 gnu/services/monitoring.scm  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index 172e58a9ff..3e346c3813 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -480,7 +480,7 @@ with text blocks from other extensions and the base 
service."))
 
 (define (home-bash-extensions original-config extension-configs)
   (match original-config
-    (($ <home-bash-configuration> _ _ _ environment-variables aliases
+    (($ <home-bash-configuration> _ _ environment-variables aliases
                                   bash-profile bashrc bash-logout)
      (home-bash-configuration
       (inherit original-config)
diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm
index b19c6c9f18..d6dc2c1e03 100644
--- a/gnu/services/monitoring.scm
+++ b/gnu/services/monitoring.scm
@@ -576,7 +576,7 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
 
 (define (zabbix-front-end-nginx-extension config)
   (match config
-    (($ <zabbix-front-end-configuration> _ server nginx)
+    (($ <zabbix-front-end-configuration> server nginx)
      (if (null? nginx)
          (list
           (nginx-server-configuration



reply via email to

[Prev in Thread] Current Thread [Next in Thread]