From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
To: "Gábor Boskovits" <boskovits@gmail.com>, 35619@debbugs.gnu.org
Subject: [bug#35619] [PATCH 3/5] gnu: postfix-minimal: Fix startup warnings.
Date: Mon, 10 Aug 2020 08:51:10 +0200 [thread overview]
Message-ID: <20200810065112.6879-3-janneke@gnu.org> (raw)
In-Reply-To: <20200810065112.6879-1-janneke@gnu.org>
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 | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 94236bbbcd..5f622595c9 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -35,6 +35,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Brant Gardner <brantcgardner@brantware.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3569,7 +3570,10 @@ based on asyncio.")
"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 _
@@ -3601,14 +3605,20 @@ based on asyncio.")
(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"))
- #t))
+ (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")))
+ #t)))
(add-before 'install 'configure-install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
next prev parent reply other threads:[~2020-08-10 6:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 15:15 [bug#35619] WIP version of postfix.scm Brant Gardner
2020-08-10 6:51 ` [bug#35619] [PATCH 1/5] gnu: postfix-minimal: Updato to 3.5.0 Jan (janneke) Nieuwenhuizen
2020-08-10 6:51 ` [bug#35619] [PATCH 2/5] system: examples: Add postfix.tmpl Jan (janneke) Nieuwenhuizen
2020-08-10 6:51 ` Jan (janneke) Nieuwenhuizen [this message]
2020-08-10 6:51 ` [bug#35619] [PATCH 4/5] service: postfix: Use mail-aliases-service-type Jan (janneke) Nieuwenhuizen
2020-08-10 6:51 ` [bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service Jan (janneke) Nieuwenhuizen
2021-07-29 16:22 ` Christine Lemmer-Webber
2021-07-29 18:49 ` Gábor Boskovits
2021-07-30 14:16 ` Christine Lemmer-Webber
2022-06-12 10:29 ` [bug#35619] WIP version of postfix.scm Ricardo Wurmus
2023-09-07 16:13 ` Ricardo Wurmus
2023-09-07 19:32 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200810065112.6879-3-janneke@gnu.org \
--to=janneke@gnu.org \
--cc=35619@debbugs.gnu.org \
--cc=boskovits@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).