diff options
| author | Cayetano Santos <csantosb@inventati.org> | 2026-01-01 20:28:41 +0100 |
|---|---|---|
| committer | Cayetano Santos <csantosb@inventati.org> | 2026-01-16 17:02:25 +0100 |
| commit | 58da9c2f7ec7549befc4c4fe1b9f1b4910ae0afe (patch) | |
| tree | 1e0df4db218aca462293dd9f5ff79ed0584cf5ce /gnu/packages | |
| parent | a1e5b01d6dcd37c0b2b9aa66dd57f33ccca926f7 (diff) | |
gnu: parallel: Modernize.
* gnu/packages/parallel.scm (parallel)[arguments]: Use G-Expressions.
Closes guix/guix!5311
Change-Id: I5bd5613eb3fb8332cb14dccc46cda5bafc44195a
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/parallel.scm | 67 |
1 files changed, 32 insertions, 35 deletions
diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 853e22c4d0b..198a161da74 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm | |||
| @@ -102,41 +102,38 @@ | |||
| 102 | "src/parallel_cheat_bw.pdf"))))) | 102 | "src/parallel_cheat_bw.pdf"))))) |
| 103 | (build-system gnu-build-system) | 103 | (build-system gnu-build-system) |
| 104 | (arguments | 104 | (arguments |
| 105 | `(#:configure-flags | 105 | (list |
| 106 | (list (string-append "--docdir=" (assoc-ref %outputs "doc") | 106 | #:configure-flags |
| 107 | "/share/doc/parallel")) | 107 | #~(list (string-append "--docdir=" #$output:doc "/share/doc/parallel")) |
| 108 | #:phases | 108 | #:phases |
| 109 | (modify-phases %standard-phases | 109 | #~(modify-phases %standard-phases |
| 110 | (add-after 'unpack 'patch-bin-sh | 110 | (add-after 'unpack 'patch-bin-sh |
| 111 | (lambda _ | 111 | (lambda _ |
| 112 | (for-each | 112 | (for-each |
| 113 | (lambda (file) | 113 | (lambda (file) |
| 114 | (substitute* file | 114 | (substitute* file |
| 115 | ;; Patch hard coded '/bin/sh' in the line ending in: | 115 | ;; Patch hard coded '/bin/sh' in the line ending in: |
| 116 | ;; $Global::shell = $ENV{'PARALLEL_SHELL'} || | 116 | ;; $Global::shell = $ENV{'PARALLEL_SHELL'} || |
| 117 | ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh"; | 117 | ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh"; |
| 118 | (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n")))) | 118 | (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n")))) |
| 119 | (list "src/parallel" "src/sem")))) | 119 | (list "src/parallel" "src/sem")))) |
| 120 | (add-before 'install 'add-install-to-path | 120 | (add-before 'install 'add-install-to-path |
| 121 | (lambda* (#:key outputs #:allow-other-keys) | 121 | (lambda _ |
| 122 | (setenv "PATH" (string-append (getenv "PATH") ":" | 122 | (setenv "PATH" |
| 123 | (assoc-ref outputs "out") "/bin")))) | 123 | (string-append (getenv "PATH") ":" #$output "/bin")))) |
| 124 | (add-after 'install 'wrap-program | 124 | (add-after 'install 'wrap-program |
| 125 | (lambda* (#:key inputs outputs #:allow-other-keys) | 125 | (lambda* (#:key inputs #:allow-other-keys) |
| 126 | (let ((out (assoc-ref outputs "out"))) | 126 | (wrap-program (string-append #$output "/bin/parallel") |
| 127 | (wrap-program (string-append out "/bin/parallel") | 127 | `("PATH" ":" prefix |
| 128 | `("PATH" ":" prefix | 128 | ,(map (lambda (input) |
| 129 | ,(map (lambda (input) | 129 | (string-append (assoc-ref inputs input) "/bin")) |
| 130 | (string-append (assoc-ref inputs input) "/bin")) | 130 | '("perl" "procps")))))) |
| 131 | '("perl" | 131 | (add-after 'wrap-program 'post-install-test |
| 132 | "procps"))))))) | 132 | (lambda* (#:key tests? #:allow-other-keys) |
| 133 | (add-after 'wrap-program 'post-install-test | 133 | (when tests? |
| 134 | (lambda* (#:key tests? outputs #:allow-other-keys) | 134 | (invoke (string-append #$output "/bin/parallel") |
| 135 | (when tests? | 135 | "echo" |
| 136 | (invoke (string-append | 136 | ":::" "1" "2" "3"))))))) |
| 137 | (assoc-ref outputs "out") "/bin/parallel") | ||
| 138 | "echo" | ||
| 139 | ":::" "1" "2" "3"))))))) | ||
| 140 | (native-inputs | 137 | (native-inputs |
| 141 | (list perl pod2pdf)) | 138 | (list perl pod2pdf)) |
| 142 | (inputs | 139 | (inputs |
