diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix deleted file mode 100644 index ae22f0be179..00000000000 --- a/pkgs/development/libraries/sundials/2.x.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, cmake -, fetchurl -, python -# GNU Octave needs KLU for ODE solvers -, suitesparse -, blas, lapack -, gfortran -, lapackSupport ? true }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "sundials"; - version = "2.7.0"; - - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ - gfortran - suitesparse - ]; - nativeBuildInputs = [ cmake ]; - - src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk"; - }; - - patches = [ - (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - }) - ]; - - cmakeFlags = [ - "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" - ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" - # GNU Octave needs KLU for ODE solvers - "-DKLU_ENABLE=ON" - "-DKLU_INCLUDE_DIR=${suitesparse}/include" - "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}" - ]; - - # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 - doCheck = false; - checkPhase = "make test"; - - meta = with stdenv.lib; { - description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = "https://computation.llnl.gov/projects/sundials"; - platforms = platforms.all; - maintainers = with maintainers; [ idontgetoutmuch ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915e8dd883e..b6c5345dba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16178,10 +16178,6 @@ in python = python3; }; - sundials_2 = callPackage ../development/libraries/sundials/2.x.nix { - python = python3; - }; - sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index 7479377bd30..5e309a0129c 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -9,7 +9,7 @@ let blasUsers = [ # "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull" "fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus" - "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4" + "sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4" "suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra" "arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo" "xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta"