From 238248aac98daa8d455fc0c2244ba3e0175cb8b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 16 Nov 2022 23:10:39 -0500 Subject: [PATCH] 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 @@ (define-configuration/no-serialization home-bash-extension (define (home-bash-extensions original-config extension-configs) (match original-config - (($ _ _ _ environment-variables aliases + (($ _ _ 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 @@ (define %zabbix-front-end-configuration-nginx (define (zabbix-front-end-nginx-extension config) (match config - (($ _ server nginx) + (($ server nginx) (if (null? nginx) (list (nginx-server-configuration