From 95439a7e7d711c172c9b5160488f055f3d82d07a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 24 Jul 2020 13:29:01 -0400 Subject: [PATCH] hdf5_1_8: remove - no longer needed as `libminc` has been updated to use the default hdf5 --- pkgs/tools/misc/hdf5/1_8.nix | 75 --------------------------------- pkgs/top-level/all-packages.nix | 6 --- 2 files changed, 81 deletions(-) delete mode 100644 pkgs/tools/misc/hdf5/1_8.nix diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix deleted file mode 100644 index 849fa6b9ac3b..000000000000 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv -, fetchurl -, removeReferencesTo -, cpp ? false -, gfortran ? null -, fortran2003 ? false -, zlib ? null -, szip ? null -, mpi ? null -, enableShared ? true -}: - -# cpp and mpi options are mutually exclusive -# (--enable-unsupported could be used to force the build) -assert !cpp || mpi == null; - -# Need a Fortran compiler for Fortran2003 bindings -assert fortran2003 -> gfortran != null; - -# No point splitting version 1.8.18 into multiple outputs. -# The library /lib/libhdf5.so has a reference to gcc-wrapper - -let inherit (stdenv.lib) optional optionals; in - -stdenv.mkDerivation rec { - version = "1.8.19"; - pname = "hdf5"; - src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0f3jfbqpaaq21ighi40qzs52nb52kc2d2yjk541rjmsx20b3ih2r" ; - }; - - passthru = { - mpiSupport = (mpi != null); - inherit mpi; - }; - - nativeBuildInputs = [ removeReferencesTo ]; - - buildInputs = [] - ++ optional (gfortran != null) gfortran - ++ optional (szip != null) szip; - - propagatedBuildInputs = [] - ++ optional (zlib != null) zlib - ++ optional (mpi != null) mpi; - - configureFlags = [] - ++ optional cpp "--enable-cxx" - ++ optional (gfortran != null) "--enable-fortran" - ++ optional fortran2003 "--enable-fortran2003" - ++ optional (szip != null) "--with-szlib=${szip}" - ++ optionals (mpi != null) ["--enable-parallel" "CC=${mpi}/bin/mpicc"] - ++ optional enableShared "--enable-shared"; - - patches = [./bin-mv.patch]; - - postInstall = '' - find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + - ''; - - meta = { - description = "Data model, library, and file format for storing and managing data"; - longDescription = '' - HDF5 supports an unlimited variety of datatypes, and is designed for flexible and efficient - I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing - applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and - applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. - ''; - license = stdenv.lib.licenses.free; # BSD-like - homepage = "https://www.hdfgroup.org/HDF5/"; - platforms = stdenv.lib.platforms.unix; - broken = (gfortran != null) && stdenv.isDarwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9432c1aaf54c..21748885535e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4371,12 +4371,6 @@ in mpi = null; }; - hdf5_1_8 = callPackage ../tools/misc/hdf5/1_8.nix { - gfortran = null; - szip = null; - mpi = null; - }; - hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpi = pkgs.openmpi;