[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu: postfix-minimal: Fix startup warnings.
From: |
guix-commits |
Subject: |
05/10: gnu: postfix-minimal: Fix startup warnings. |
Date: |
Tue, 16 May 2023 11:43:02 -0400 (EDT) |
rekado pushed a commit to branch wip-postfix
in repository guix.
commit 6d962b3c8ca878f51adc46a4fa192a56d068e2c3
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Mar 17 08:37:32 2020 +0100
gnu: postfix-minimal: Fix startup warnings.
This avoids kind of funny replacements like these of `rm'
find -prune -perm -020
=>
find -prune
-pe/gnu/store/zibwkb5xavnv6z3gzknfqjsxb9b0izh0-coreutils-8.31/bin/rm -020
* gnu/packages/mail.scm (postfix-minimal)[phases]: Set PATH rather than
substituting individual commands.
---
gnu/packages/mail.scm | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 0036ddf5c4..0b940eeb43 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -41,6 +41,7 @@
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 divoplade <d@divoplade.fr>
;;; Copyright © 2020 Brant Gardner <brantcgardner@brantware.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca>
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
@@ -4985,7 +4986,10 @@ features:
"1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ '(#:modules ((srfi srfi-26)
+ (guix build utils)
+ (guix build gnu-build-system))
+ #:phases
(modify-phases %standard-phases
(add-before 'build 'patch-/bin/sh
(lambda _
@@ -5014,13 +5018,19 @@ features:
(lambda _
(invoke "make" "makefiles" "pie=yes" "dynamicmaps=yes")))
(add-before 'install 'fix-postfix-scripts-path
- (lambda _
- (for-each
- (lambda (command)
- (substitute* '("postfix-install" "conf/post-install"
"conf/postfix-script")
- (((string-append command " ")) (string-append (which
command) " "))))
- '("awk" "chmod" "chown" "chgrp" "cp" "find" "ln" "mkdir" "mv"
"rm" "sed"
- "sleep" "sort" "touch" "uname"))))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((path (string-join
+ (map (compose (cute string-append <> "/bin")
+ (cute assoc-ref inputs <>))
+ '("bash" "coreutils" "findutils" "gawk" "grep"
+ "sed"))
+ ":")))
+ (substitute* '("postfix-install"
+ "conf/post-install"
+ "conf/postfix-script")
+ (("^SHELL=/bin/sh")
+ (string-append "PATH=" path "\n"
+ "SHELL=" (assoc-ref inputs "bash")
"/bin/sh"))))))
(add-before 'install 'configure-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- branch wip-postfix created (now 921968f958), guix-commits, 2023/05/16
- 01/10: gnu: Add postfix., guix-commits, 2023/05/16
- 04/10: system: examples: Add postfix.tmpl., guix-commits, 2023/05/16
- 07/10: system: postfix.tmpl: Add mail-aliases-service., guix-commits, 2023/05/16
- 09/10: gnu: postfix-minimal: Simplify with G-expression., guix-commits, 2023/05/16
- 05/10: gnu: postfix-minimal: Fix startup warnings.,
guix-commits <=
- 06/10: service: postfix: Use mail-aliases-service-type., guix-commits, 2023/05/16
- 02/10: services: Add postfix service., guix-commits, 2023/05/16
- 03/10: gnu: postfix-minimal: Update to 3.5.0., guix-commits, 2023/05/16
- 08/10: gnu: postfix-minimal: Update to 3.7.2., guix-commits, 2023/05/16
- 10/10: gnu: postfix-minimal: Update to 3.7.5., guix-commits, 2023/05/16