swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44555 from markuskowa/mpich-cleanup

Browse source 
mpich2: cleanup derivation, rename to mpich
This commit is contained in:
xeji 2018-08-06 23:17:47 +02:00 committed by GitHub
parent 8835240895 ef301cc2a8
commit 937e402b35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/mpich2/default.nix → pkgs/development/libraries/mpich/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, gfortran
, slurm, openssh, hwloc
, openssh, hwloc
} :
stdenv.mkDerivation rec {
@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
"--enable-sharedlib"
];
buildInputs = [ perl gfortran slurm openssh hwloc ];
enableParallelBuilding = true;
buildInputs = [ perl gfortran openssh hwloc ];
doCheck = true;
@ -26,8 +28,12 @@ stdenv.mkDerivation rec {
echo "fix rpath: $entry"
patchelf --set-rpath "$out/lib" $entry
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; {
description = "Implementation of the Message Passing Interface (MPI) standard";
@ -43,6 +49,6 @@ stdenv.mkDerivation rec {
fullName = "MPICH license (permissive)";
};
maintainers = [ maintainers.markuskowa ];
platforms = platforms.unix;
platforms = platforms.linux;
};
}

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

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

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

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