diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-06 23:17:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 23:17:47 +0200 |
| commit | 937e402b355539f318d17da614c5516879ce646b (patch) | |
| tree | 171be5b93bf519128210e082b69ccaddda7e9eff | |
| parent | 88352408958d905c77ad0461036196282c39cf69 (diff) | |
| parent | ef301cc2a897a593a806611d60c337e1cd204298 (diff) | |
| download | nixlib-937e402b355539f318d17da614c5516879ce646b.tar nixlib-937e402b355539f318d17da614c5516879ce646b.tar.gz nixlib-937e402b355539f318d17da614c5516879ce646b.tar.bz2 nixlib-937e402b355539f318d17da614c5516879ce646b.tar.lz nixlib-937e402b355539f318d17da614c5516879ce646b.tar.xz nixlib-937e402b355539f318d17da614c5516879ce646b.tar.zst nixlib-937e402b355539f318d17da614c5516879ce646b.zip | |
Merge pull request #44555 from markuskowa/mpich-cleanup
mpich2: cleanup derivation, rename to mpich
| -rw-r--r-- | pkgs/development/libraries/mpich/default.nix (renamed from pkgs/development/libraries/mpich2/default.nix) | 14 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich/default.nix index b5a36c184ff7..87d24854255a 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -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; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3663f6e9798a..ece6c03e168a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d5ad5d3e8a9..91ad3bbb83cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |