Merge branch 'master' into staging-next

4 files changed, 56 insertions, 20 deletions

diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/applications/science/machine-learning/nengo-gui/default.nix
index 6380f25177cbe..9a100c03293ea 100644
--- a/pkgs/applications/science/machine-learning/nengo-gui/default.nix
+++ b/pkgs/applications/science/machine-learning/nengo-gui/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "nengo-gui";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchFromGitHub {
     owner = "nengo";
     repo = "nengo-gui";
-    rev = "v${version}";
-    sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-aBi4roe9pqPmpbW5zrbDoIvyH5mTKgIzL2O5j1+VBMY=";
   };
 
   propagatedBuildInputs = with python3Packages; [ nengo ];
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 876222772e86d..f4c117267d568 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -1,7 +1,12 @@
-{ lib, stdenv, fetchurl, cctools, fixDarwinDylibNames }:
+{ lib
+, stdenv
+, fetchurl
+, cctools
+, fixDarwinDylibNames
+, autoSignDarwinBinariesHook
+}:
 
 stdenv.mkDerivation rec {
-
   pname = "lp_solve";
   version = "5.5.2.11";
 
@@ -13,20 +18,24 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = lib.optionals stdenv.isDarwin [
     cctools
     fixDarwinDylibNames
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+    autoSignDarwinBinariesHook
   ];
 
   dontConfigure = true;
 
-  buildPhase = let
-    ccc = if stdenv.isDarwin then "ccc.osx" else "ccc";
-  in ''
-    runHook preBuild
+  buildPhase =
+    let
+      ccc = if stdenv.isDarwin then "ccc.osx" else "ccc";
+    in
+    ''
+      runHook preBuild
 
-    (cd lpsolve55 && bash -x -e ${ccc})
-    (cd lp_solve  && bash -x -e ${ccc})
+      (cd lpsolve55 && bash -x -e ${ccc})
+      (cd lp_solve  && bash -x -e ${ccc})
 
-    runHook postBuild
-  '';
+      runHook postBuild
+    '';
 
   installPhase = ''
     runHook preInstall
@@ -44,9 +53,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A Mixed Integer Linear Programming (MILP) solver";
-    homepage    = "http://lpsolve.sourceforge.net";
-    license     = licenses.gpl2Plus;
+    homepage = "http://lpsolve.sourceforge.net";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
-    platforms   = platforms.unix;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch
new file mode 100644
index 0000000000000..6e90faf9f0373
--- /dev/null
+++ b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch
@@ -0,0 +1,13 @@
+diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
+index ca353c4099..499be0a986 100644
+--- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
+ 
+   // Only set an alternative stack if there isn't already one, or if the current
+   // one is too small.
diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix
index 30677d6067e9a..c397e19fcf0c2 100644
--- a/pkgs/applications/science/misc/graphia/default.nix
+++ b/pkgs/applications/science/misc/graphia/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, lib, cmake, fetchFromGitHub
-, wrapQtAppsHook, qtbase, qtquickcontrols2, qtgraphicaleffects
+{ stdenv
+, lib
+, cmake
+, fetchFromGitHub
+, wrapQtAppsHook
+, qtbase
+, qtquickcontrols2
+, qtgraphicaleffects
 }:
 
 stdenv.mkDerivation rec {
   pname = "graphia";
-  version = "2.2";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "graphia-app";
     repo = "graphia";
     rev = version;
-    sha256 = "sha256:05givvvg743sawqy2vhljkfgn5v1s907sflsnsv11ddx6x51na1w";
+    sha256 = "sha256-9JIVMtu8wlux7vIapOQQIemE7ehIol2XZuIvwLfB8fY=";
   };
 
+  patches = [
+    # Fix for a breakpad incompatibility with glibc>2.33
+    # https://github.com/pytorch/pytorch/issues/70297
+    # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
+    ./breakpad-sigstksz.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook
   ];
+
   buildInputs = [
     qtbase
     qtquickcontrols2