diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
| commit | 57ddc155fcdb5a419860dd4a6ed03deabcc162f2 (patch) | |
| tree | eb44f417d88b209821f8c8522eac90af195a8302 /pkgs/development/python-modules | |
| parent | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (diff) | |
| parent | f0da094b2e2e885e4c2ea7930583c6fa302add0f (diff) | |
| download | nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.gz nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.bz2 nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.lz nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.xz nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.zst nixpkgs-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/games/scummvm/default.nix
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/h5py/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 37265a88e2c..e2cb11cedb4 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -12,11 +12,11 @@ let in buildPythonPackage rec { name = "h5py-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://pypi/h/h5py/${name}.tar.gz"; - sha256 = "9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6"; + sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj"; }; configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi"; |