diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2014-06-23 22:58:04 +0200 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2014-06-23 22:58:04 +0200 |
| commit | ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88 (patch) | |
| tree | bf4ad8dc687a2f8519309d18df10287e1d4565ff /pkgs/tools/misc | |
| parent | 0e54b7980aeef48994810f95ffcb4fe96decfdd7 (diff) | |
| parent | 5a32b6b4ef99d212b8959987a63ea53d3b2b3cf5 (diff) | |
| download | nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar.gz nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar.bz2 nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar.lz nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar.xz nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.tar.zst nixlib-ba654b93681dcdaa9ec5e5c171ffb4b8d91dbb88.zip | |
Merge pull request #3056 from aherrmann/pr_tables
Python module tables
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/hdf5/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 01820aaf7780..a7d03d1335f0 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -1,14 +1,22 @@ { stdenv , fetchurl +, zlib ? null +, szip ? null }: -stdenv.mkDerivation { - name = "hdf5-1.8.10-patch1"; +stdenv.mkDerivation rec { + version = "1.8.13"; + name = "hdf5-${version}-patch1"; src = fetchurl { - url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz; - sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz"; + url = "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"; + sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; - buildInputs = [] ; + + buildInputs = [] + ++ stdenv.lib.optional (zlib != null) zlib + ++ stdenv.lib.optional (szip != null) szip; + + configureFlags = if szip != null then "--with-szlib=${szip}" else ""; patches = [./bin-mv.patch]; |