diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f5ec01fab6bb..d0ffaa2408ef 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4661,6 +4661,12 @@ githubId = 37017396; name = "gbtb"; }; + gdinh = { + email = "nix@contact.dinh.ai"; + github = "gdinh"; + githubId = 34658064; + name = "Grace Dinh"; + }; gebner = { email = "gebner@gebner.org"; github = "gebner"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index ebf167de8d9d..c0abcf6da659 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -38,8 +38,11 @@ stdenv.mkDerivation rec { checkInputs = [ openssh ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - doCheck = true; + # xslu and xsllt tests seem to time out on x86_64-darwin. + # this line is left so those who force installation on x86_64-darwin can still build + doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); preConfigure = '' cmakeFlagsArray+=( @@ -73,7 +76,9 @@ stdenv.mkDerivation rec { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ costrouc markuskowa ]; + platforms = platforms.unix; + maintainers = with maintainers; [ costrouc markuskowa gdinh ]; + # xslu and xsllt tests fail on x86 darwin + broken = stdenv.isDarwin && stdenv.isx86_64; }; }