From 683c3773a13383ebd4cd0611d03a7fe4b9618bf3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:27:34 +0200
Subject: [PATCH 1/4] lp_solve: do not include binutils on darwin

---
 .../science/math/lp_solve/default.nix         | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 891dd15194f4..bd38d90accc6 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -19,16 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
   };
 
-  nativeBuildInputs = [
-    binutils
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    fixDarwinDylibNames
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    autoSignDarwinBinariesHook
-  ];
+  nativeBuildInputs =
+    lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      binutils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      fixDarwinDylibNames
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   env = {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";

From ff3d1ad09101cf0ac246879f7f80e0effc1e3da1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:27:45 +0200
Subject: [PATCH 2/4] scalp: fix build with cmake 4

---
 pkgs/by-name/sc/scalp/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sc/scalp/package.nix b/pkgs/by-name/sc/scalp/package.nix
index 44adf8c0dd87..643fe77fd49d 100644
--- a/pkgs/by-name/sc/scalp/package.nix
+++ b/pkgs/by-name/sc/scalp/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.3.2)" "cmake_minimum_required (VERSION 3.5)" \
       --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
       --replace-fail "-m64" ""
     substituteInPlace src/tests/CMakeLists.txt \

From 18a2d0fffb692af674ca17f56873d8be1da39ac2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:33:06 +0200
Subject: [PATCH 3/4] pagsuite: 1.80 -> 1.80-unstable-2025-05-03

---
 pkgs/by-name/pa/pagsuite/package.nix | 33 ++++++++++------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/pa/pagsuite/package.nix b/pkgs/by-name/pa/pagsuite/package.nix
index 850732275cb3..273a728c2e8d 100644
--- a/pkgs/by-name/pa/pagsuite/package.nix
+++ b/pkgs/by-name/pa/pagsuite/package.nix
@@ -1,38 +1,26 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitLab,
   cmake,
-  unzip,
   gmp,
   scalp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pagsuite";
-  version = "1.80";
+  version = "1.80-unstable-2025-05-03";
 
-  src = fetchurl {
-    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
-      lib.replaceStrings [ "." ] [ "_" ] version
-    }.zip";
-    hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
+  src = fetchFromGitLab {
+    domain = "gitlab.com";
+    owner = "kumm";
+    repo = "pagsuite";
+    rev = "1cc657765658cb2eb622d4a9c656ab9854150e7d";
+    hash = "sha256-jyp3h5n6SkyTpLzqMezvu2nri6rDkX3ACcCO9r4/bBA=";
   };
 
-  patches = [
-    # Fix issue with latest ScaLP update
-    (fetchpatch {
-      url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
-      hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
-    })
-  ];
-
-  sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";
-
   nativeBuildInputs = [
     cmake
-    unzip
   ];
 
   buildInputs = [
@@ -40,6 +28,9 @@ stdenv.mkDerivation rec {
     scalp
   ];
 
+  # make[2]: ***  No rule to make target 'lib/libpag.dylib', needed by 'bin/osr'.  Stop.
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "Optimization tools for the (P)MCM problem";
     homepage = "https://gitlab.com/kumm/pagsuite";

From a9eee7c2e13f49f59b15cdf3e4ce84f1533e330f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:42:19 +0200
Subject: [PATCH 4/4] flopoco: fix build with cmake 4

---
 pkgs/by-name/fl/flopoco/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/fl/flopoco/package.nix b/pkgs/by-name/fl/flopoco/package.nix
index b2e81c17764c..6d32636b1098 100644
--- a/pkgs/by-name/fl/flopoco/package.nix
+++ b/pkgs/by-name/fl/flopoco/package.nix
@@ -74,6 +74,10 @@ stdenv.mkDerivation {
     ./flopoco BuildAutocomplete
   '';
 
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+  ];
+
   installPhase = ''
     runHook preInstall