From b63496ba6b03080f99fb56671ec6ef60b340e6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 31 Aug 2014 15:12:17 +0200
Subject: [PATCH] Revert "h5py: New package, version 2.3.1"

This reverts commit 3c6afb34967a241e2c2e106cb02bad55b5389b94.

Doesn't build.
---
 .../python-modules/h5py/default.nix           | 43 -------------------
 pkgs/top-level/python-packages.nix            | 13 ------
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/h5py/default.nix

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
deleted file mode 100644
index 9ab68ac4cd2b..000000000000
--- a/pkgs/development/python-modules/h5py/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, python, buildPythonPackage
-, numpy, hdf5, cython
-, mpiSupport ? false, mpi4py ? null, mpi ? null }:
-
-assert mpiSupport == hdf5.mpiSupport;
-assert mpiSupport -> mpi != null
-  && mpi4py != null
-  && mpi == mpi4py.mpi
-  && mpi == hdf5.mpi
-  ;
-
-with stdenv.lib;
-
-buildPythonPackage rec {
-  name = "h5py-2.3.1";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz";
-    md5 = "8f32f96d653e904d20f9f910c6d9dd91";
-  };
-
-  setupPyBuildFlags = [ "--hdf5=${hdf5}" ]
-    ++ optional mpiSupport "--mpi"
-    ;
-  setupPyInstallFlags = setupPyBuildFlags;
-
-  preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
-
-  buildInputs = [ hdf5 cython ]
-    ++ optional mpiSupport mpi
-    ;
-  propagatedBuildInputs = [ numpy ]
-    ++ optional mpiSupport mpi4py
-    ;
-
-  meta = {
-    description = "
-      The h5py package is a Pythonic interface to the HDF5 binary data format.
-    ";
-    homepage = "http://www.h5py.org/";
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc8f70d936cc..dad9da5324d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -90,19 +90,6 @@ rec {
     '';
   };
 
-  h5py = callPackage ../development/python-modules/h5py {
-    inherit (pkgs) stdenv fetchurl;
-    inherit python buildPythonPackage cython numpy;
-    hdf5 = pkgs.hdf5.override { mpi = null; };
-  };
-
-  h5py-mpi = h5py.override {
-    mpiSupport = true;
-    mpi = pkgs.openmpi;
-    hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; };
-    inherit mpi4py;
-  };
-
   ipython = import ../shells/ipython {
     inherit (pkgs) stdenv fetchurl sip pyqt4;
     inherit buildPythonPackage pythonPackages;