[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: mpich: Remove input labels and trailing #t in phases.
From: |
guix-commits |
Subject: |
04/05: gnu: mpich: Remove input labels and trailing #t in phases. |
Date: |
Mon, 17 Jan 2022 13:09:30 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 3f536e01c1099fc6425c086417cf5a1af10dbab7
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jan 17 16:17:15 2022 +0100
gnu: mpich: Remove input labels and trailing #t in phases.
* gnu/packages/mpi.scm (mpich)[inputs]: Remove labels.
[arguments]: Remove trailing #t from phases.
---
gnu/packages/mpi.scm | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 749214817d..d1686f9afa 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -448,12 +448,12 @@ arrays) that expose a buffer interface.")
"1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb"))))
(build-system gnu-build-system)
(inputs
- `(("zlib" ,zlib)
- ("hwloc" ,hwloc-2 "lib")
- ("slurm" ,slurm)
+ `(,zlib
+ (,hwloc-2 "lib")
+ ,slurm
,@(if (and (not (%current-target-system))
(member (%current-system) (package-supported-systems ucx)))
- `(("ucx" ,ucx))
+ (list ucx)
'())))
(native-inputs
(list perl which gfortran))
@@ -490,8 +490,7 @@ arrays) that expose a buffer interface.")
(substitute* (find-files "." "f77tof90")
(("/usr/bin/env") (which "env")))
(substitute* (find-files "." "\\.sh$")
- (("/bin/sh") (which "sh")))
- #t))
+ (("/bin/sh") (which "sh")))))
(add-before 'configure 'fix-makefile
(lambda _
;; Remove "@hwloclib@" from 'pmpi_convenience_libs'.
@@ -501,8 +500,7 @@ arrays) that expose a buffer interface.")
(("^pmpi_convenience_libs = (.*) @hwloclib@ (.*)$" _
before after)
(string-append "pmpi_convenience_libs = "
- before " " after)))
- #t))
+ before " " after)))))
(add-before 'configure 'define-gfortran-wrapper
(lambda* (#:key inputs #:allow-other-keys)
;; 'configure' checks whether the Fortran compiler