From 6ea4ce1184238d0a1d76ffb79b31470edee5759e Mon Sep 17 00:00:00 2001
From: Grace Dinh <git@contact.dinh.ai>
Date: Fri, 12 Aug 2022 00:48:54 -0700
Subject: [PATCH 1/3] maintainers: add gdinh

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 253691fb2c6a..b5af4d65b902 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";

From fb24dd718f63abe5f723508aa600a9cc2c2ce270 Mon Sep 17 00:00:00 2001
From: Grace Dinh <git@contact.dinh.ai>
Date: Fri, 12 Aug 2022 02:52:03 -0700
Subject: [PATCH 2/3] scalapack: add darwin support

---
 .../libraries/science/math/scalapack/default.nix         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index ebf167de8d9d..4f41cdb5fb7e 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" ];
+    platforms = platforms.unix;
     maintainers = with maintainers; [ costrouc markuskowa ];
+    # xslu and xsllt tests fail on x86 darwin
+    broken = stdenv.isDarwin && stdenv.isx86_64;
   };
 }

From 2464f69c9482365a61eef824b8f6a0cdb50f0e79 Mon Sep 17 00:00:00 2001
From: Grace Dinh <git@contact.dinh.ai>
Date: Fri, 12 Aug 2022 02:53:09 -0700
Subject: [PATCH 3/3] scalapack: add gdinh to maintainers

---
 pkgs/development/libraries/science/math/scalapack/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 4f41cdb5fb7e..c0abcf6da659 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
     license = licenses.bsd3;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ costrouc markuskowa ];
+    maintainers = with maintainers; [ costrouc markuskowa gdinh ];
     # xslu and xsllt tests fail on x86 darwin
     broken = stdenv.isDarwin && stdenv.isx86_64;
   };