From c51b8dc2249974177d50d7b2662615f78abc4929 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 19 Jul 2016 12:30:31 +0200
Subject: [PATCH] pythonPackages.{h5py, h5py-mpi}: simplify
 expression/assertions

---
 pkgs/development/python-modules/h5py/default.nix | 15 +++++++--------
 pkgs/top-level/python-packages.nix               |  6 ++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 5b1ca192790..37265a88e2c 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,17 +1,16 @@
 { stdenv, fetchurl, python, buildPythonPackage
 , numpy, hdf5, cython, six, pkgconfig
-, mpiSupport ? false, mpi4py ? null, mpi ? null }:
+, mpi4py ? null }:
 
-assert mpiSupport == hdf5.mpiSupport;
-assert mpiSupport -> mpi != null
-  && mpi4py != null
-  && mpi == mpi4py.mpi
-  && mpi == hdf5.mpi
-  ;
+assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
 
 with stdenv.lib;
 
-buildPythonPackage rec {
+let
+  mpi = hdf5.mpi;
+  mpiSupport = hdf5.mpiSupport;
+
+in buildPythonPackage rec {
   name = "h5py-${version}";
   version = "2.5.0";
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0887cf084c7..783578b1f1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -227,13 +227,11 @@ in modules // {
   };
 
   h5py = callPackage ../development/python-modules/h5py {
-    hdf5 = pkgs.hdf5.override { mpi = null; };
+    hdf5 = pkgs.hdf5;
   };
 
   h5py-mpi = self.h5py.override {
-    mpiSupport = true;
-    mpi = pkgs.openmpi;
-    hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
+    hdf5 = pkgs.hdf5-mpi;
   };
 
   mpi4py = callPackage ../development/python-modules/mpi4py {