nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mpich2: cleanup, rename to mpich

Browse Source 
* mpich2 -> mpich
* remove slurm dependency
* use most recent gfortran
* turn enableParallelBulding on
* ensure mpi[cc,cxx,fort] uses default compilers it was built with
This commit is contained in:
Markus Kowalewski 2018-08-06 14:44:46 +02:00
parent cd794f4216
commit 87925f0ba6
No known key found for this signature in database
GPG Key ID: 502A248E3FB4FF48
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/mpich2/default.nix → pkgs/development/libraries/mpich/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, gfortran { stdenv, fetchurl, perl, gfortran
, slurm, openssh, hwloc , openssh, hwloc
} : } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
"--enable-sharedlib" "--enable-sharedlib"
]; ];
buildInputs = [ perl gfortran slurm openssh hwloc ]; enableParallelBuilding = true;
buildInputs = [ perl gfortran openssh hwloc ];
doCheck = true; doCheck = true;
@ -26,8 +28,12 @@ stdenv.mkDerivation rec {
echo "fix rpath: $entry" echo "fix rpath: $entry"
patchelf --set-rpath "$out/lib" $entry patchelf --set-rpath "$out/lib" $entry
done done
'';
# Ensure the default compilers are the ones mpich was built with
sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc
sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Implementation of the Message Passing Interface (MPI) standard"; description = "Implementation of the Message Passing Interface (MPI) standard";

1
pkgs/top-level/aliases.nix
View File

@ -171,6 +171,7 @@ mapAliases ({
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22 module_init_tools = kmod; # added 2016-04-22
mpich2 = mpich; # added 2018-08-06
msf = metasploit; # added 2018-04-25 msf = metasploit; # added 2018-04-25
mssys = ms-sys; # added 2015-12-13 mssys = ms-sys; # added 2015-12-13
multipath_tools = multipath-tools; # added 2016-01-21 multipath_tools = multipath-tools; # added 2016-01-21

4
pkgs/top-level/all-packages.nix
View File

@ -11071,9 +11071,7 @@ with pkgs;
libmpc = callPackage ../development/libraries/libmpc { }; libmpc = callPackage ../development/libraries/libmpc { };
mpich2 = callPackage ../development/libraries/mpich2 { mpich = callPackage ../development/libraries/mpich { };
gfortran = gfortran5;
};
mstpd = callPackage ../os-specific/linux/mstpd { }; mstpd = callPackage ../os-specific/linux/mstpd { };