From 354abfaaa297272455046a7522913edf7e3296d7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 26 May 2022 09:02:22 +0300 Subject: [PATCH] sundials: 5.7.0 -> 6.2.0 --- .../libraries/sundials/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 0b3dff1ebd83..d6d2b3bbe6df 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,16 +12,19 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.7.0"; + version = "6.2.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; + hash = "sha256-GV1Vk3cvxIP2Pwh5TXnkurMMLsWObOSw+2vMDgxI8x0="; }; - nativeBuildInputs = [ cmake gfortran ]; + nativeBuildInputs = [ + cmake + gfortran + ]; buildInputs = [ python @@ -32,9 +35,8 @@ stdenv.mkDerivation rec { blas lapack ]) - # KLU support is based on Suitesparse. - # It is tested upstream according to the section 1.1.4 of - # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) + # KLU support is based on Suitesparse. It is tested upstream according to the + # section 1.1.4.2 of INSTALL_GUIDE.pdf found in the source tarball. ++ lib.optionals (kluSupport) [ suitesparse ]; @@ -64,11 +66,13 @@ stdenv.mkDerivation rec { # # build error: # - # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. + # /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. # ldr x0, [x0, ___stack_chk_guard];momd # ^ - # /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. + # /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. # ldr x0, [x0, ___stack_chk_guard];momd + # + # See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983 hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; @@ -77,7 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = "https://computation.llnl.gov/projects/sundials"; + homepage = "https://computing.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3;