Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 961d42d80f33
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 909fb246fdec
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 23, 2017

  1. openmpi: 1.10.1 -> 1.10.7

    - No more need for the nbc patch
    - Cpusets support fixed
    bzizou committed Jun 23, 2017
    Copy the full SHA
    621a114 View commit details

Commits on Jun 24, 2017

  1. Merge pull request #26783 from Gricad/openmpi

    openmpi: 1.10.1 -> 1.10.7
    Mic92 authored Jun 24, 2017
    Copy the full SHA
    909fb24 View commit details
Showing with 2 additions and 38 deletions.
  1. +2 −8 pkgs/development/libraries/openmpi/default.nix
  2. +0 −30 pkgs/development/libraries/openmpi/nbc_copy.patch
10 changes: 2 additions & 8 deletions pkgs/development/libraries/openmpi/default.nix
Original file line number Diff line number Diff line change
@@ -13,19 +13,13 @@ let
majorVersion = "1.10";

in stdenv.mkDerivation rec {
name = "openmpi-${majorVersion}.1";
name = "openmpi-${majorVersion}.7";

src = fetchurl {
url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br";
sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0";
};

# Bug in openmpi implementation for zero sized messages
# Patch required to make mpi4py pass. Will NOT
# be required when openmpi >= 2.0.0
# https://www.open-mpi.org/community/lists/users/2015/11/28030.php
patches = [ ./nbc_copy.patch ];

buildInputs = [ gfortran ]
++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs;

30 changes: 0 additions & 30 deletions pkgs/development/libraries/openmpi/nbc_copy.patch

This file was deleted.