Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 24 insertions, 7 deletions

diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix
index 75c238a430c4..3093c5330a88 100644
--- a/nixpkgs/pkgs/development/libraries/sundials/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix
@@ -12,16 +12,19 @@
 
 stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "5.7.0";
+  version = "6.3.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-iaIr6oIP8lCqcjn2NKsH+jTv4dLc/eKcyNOvEUVboqc=";
   };
 
-  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
   ];
@@ -59,12 +61,27 @@ stdenv.mkDerivation rec {
   )]
   ;
 
+  # disable stackprotector on aarch64-darwin for now
+  # https://github.com/NixOS/nixpkgs/issues/127608
+  #
+  # build error:
+  #
+  # /private/tmp/nix-build-sundials-6.3.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-6.3.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" ];
+
   doCheck = true;
   checkTarget = "test";
 
   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;