summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-16 23:10:39 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-11-17 06:49:51 -0500
commit238248aac98daa8d455fc0c2244ba3e0175cb8b7 (patch)
tree4921121d0a4fa4c3d8a1bbe51ab61e70e0fb6006
parent44554e7133aa60e1b453436be1e80394189cabd9 (diff)
downloadguix-238248aac98daa8d455fc0c2244ba3e0175cb8b7.tar.gz
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.
-rw-r--r--gnu/home/services/shells.scm2
-rw-r--r--gnu/services/monitoring.scm2
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