all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ben Woodcroft <donttrustben@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 01/22] gnu: parallel: Use full paths for executables.
Date: Wed, 27 Jul 2016 22:54:02 +1000	[thread overview]
Message-ID: <d3453a89a3858e7455e46040f96146f52b9c24aa.1469622378.git.donttrustben@gmail.com> (raw)
In-Reply-To: <20160727125423.7768-1-donttrustben@gmail.com>

* gnu/packages/parallel.scm (parallel)[inputs]: Add procps.
[arguments]: New field.
---
 gnu/packages/parallel.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 12f0028..3bb078e 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,7 +55,31 @@
        (base32
         "08gm0i9vj2nz8qgqi98z00myypgb3dni0s5yf3l17fp8h78fp4g3"))))
     (build-system gnu-build-system)
-    (inputs `(("perl" ,perl)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (for-each
+              (lambda (file)
+                (substitute* file
+                  ;; Patch hard coded '/bin/sh' in the lin ending in:
+                  ;; $Global::shell = $ENV{'PARALLEL_SHELL'} ||
+                  ;;  parent_shell($$) || $ENV{'SHELL'} || "/bin/sh";
+                  (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n"))
+                  ;; Patch call to 'ps' and 'perl' commands.
+                  ((" ps ") (string-append " " (which "ps") " "))
+                  ((" perl -") (string-append " " (which "perl") " -"))))
+              (list "src/parallel" "src/sem"))))
+         (add-after 'install 'post-install-test
+           (lambda* (#:key outputs #:allow-other-keys)
+             (zero? (system* (string-append
+                              (assoc-ref outputs "out") "/bin/parallel")
+                             "echo"
+                             ":::" "1" "2" "3")))))))
+    (inputs
+     `(("perl" ,perl)
+       ("procps" ,procps)))
     (home-page "http://www.gnu.org/software/parallel/")
     (synopsis "Build and execute command lines in parallel")
     (description
-- 
2.9.1

  reply	other threads:[~2016-07-27 12:54 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-27 12:54 PATCH [0/22]: Add roary Ben Woodcroft
2016-07-27 12:54 ` Ben Woodcroft [this message]
2016-07-27 12:54   ` [PATCH 02/22] gnu: Add perl-xml-writer Ben Woodcroft
2016-07-27 12:54   ` [PATCH 03/22] gnu: Add perl-parse-yapp Ben Woodcroft
2016-07-27 12:54   ` [PATCH 04/22] gnu: Add perl-graph Ben Woodcroft
2016-07-27 12:54   ` [PATCH 05/22] gnu: Add perl-graph-readwrite Ben Woodcroft
2016-07-27 12:54   ` [PATCH 06/22] gnu: Add perl-log-log4perl Ben Woodcroft
2016-07-27 12:54   ` [PATCH 07/22] gnu: Add perl-file-slurper Ben Woodcroft
2016-07-27 12:54   ` [PATCH 08/22] gnu: Add perl-file-path Ben Woodcroft
2016-07-27 12:54   ` [PATCH 09/22] gnu: Add perl-file-grep Ben Woodcroft
2016-07-27 12:54   ` [PATCH 10/22] gnu: Add perl-array-utils Ben Woodcroft
2016-07-27 12:54   ` [PATCH 11/22] gnu: Add perl-test-files Ben Woodcroft
2016-07-27 12:54   ` [PATCH 12/22] gnu: Add perl-env-path Ben Woodcroft
2016-07-27 12:54   ` [PATCH 13/22] gnu: Add mcl Ben Woodcroft
2016-07-28 22:20     ` Leo Famulari
2016-07-27 12:54   ` [PATCH 14/22] gnu: Add bpp-core Ben Woodcroft
2016-07-27 12:54   ` [PATCH 15/22] gnu: Add bpp-seq Ben Woodcroft
2016-07-27 12:54   ` [PATCH 16/22] gnu: Add bpp-phyl Ben Woodcroft
2016-07-27 12:54   ` [PATCH 17/22] gnu: Add bpp-popgen Ben Woodcroft
2016-07-27 12:54   ` [PATCH 18/22] gnu: Add bppsuite Ben Woodcroft
2016-07-27 12:54   ` [PATCH 19/22] gnu: Add exonerate Ben Woodcroft
2016-07-28 22:22     ` Leo Famulari
2016-07-27 12:54   ` [PATCH 20/22] gnu: Add prank Ben Woodcroft
2016-07-27 12:54   ` [PATCH 21/22] gnu: Add raxml Ben Woodcroft
2016-07-27 12:54   ` [PATCH 22/22] gnu: Add roary Ben Woodcroft
2016-07-29 21:07     ` Leo Famulari
2016-07-28 22:31   ` [PATCH 01/22] gnu: parallel: Use full paths for executables Leo Famulari
2016-07-31 11:26 ` PATCH [0/22]: Add roary Ludovic Courtès
2016-08-08 12:16   ` Ben Woodcroft

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d3453a89a3858e7455e46040f96146f52b9c24aa.1469622378.git.donttrustben@gmail.com \
    --to=donttrustben@gmail.com \
    --cc=guix-devel@gnu.org \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.