nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: parallel: Wrap program instead of substituting 'ps' and 'perl'. 

* gnu/packages/parallel.scm (parallel)[arguments]: Replace 'ps' and 'perl'
substitutions with a 'wrap-program' phase.  Move the 'post-install-test' phase
after it.
[inputs]: Add bash.
This commit is contained in:
Clément Lassieur 2018-06-22 00:23:19 +02:00
parent 18ab54d4a2
commit 4e7950fdce
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/parallel.scm
View File

@ -8,6 +8,7 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,6 +34,7 @@
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages freeipmi) #:use-module (gnu packages freeipmi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages mpi) #:use-module (gnu packages mpi)
@ -68,20 +70,28 @@
;; Patch hard coded '/bin/sh' in the lin ending in: ;; Patch hard coded '/bin/sh' in the lin ending in:
;; $Global::shell = $ENV{'PARALLEL_SHELL'} || ;; $Global::shell = $ENV{'PARALLEL_SHELL'} ||
;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh"; ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh";
(("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n")) (("/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")) (list "src/parallel" "src/sem"))
#t)) #t))
(add-after 'install 'post-install-test (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/parallel")
`("PATH" ":" prefix
,(map (lambda (input)
(string-append (assoc-ref inputs input) "/bin"))
'("perl"
"procps"))))
#t)))
(add-after 'wrap-program 'post-install-test
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke (string-append (invoke (string-append
(assoc-ref outputs "out") "/bin/parallel") (assoc-ref outputs "out") "/bin/parallel")
"echo" "echo"
":::" "1" "2" "3")))))) ":::" "1" "2" "3"))))))
(inputs (inputs
`(("perl" ,perl) `(("bash" ,bash)
("perl" ,perl)
("procps" ,procps))) ("procps" ,procps)))
(home-page "https://www.gnu.org/software/parallel/") (home-page "https://www.gnu.org/software/parallel/")
(synopsis "Build and execute command lines in parallel") (synopsis "Build and execute command lines in parallel")