python312Packages.*: unpin Boost (#370066)

NixOS · Jan 2, 2025 · 589fc0d · 589fc0d
2 parents 6bf1c8d + 6f2b12d
commit 589fc0d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -8,13 +8,14 @@
   pytestCheckHook,
   # fetchers
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   # build tools
   cmake,
   swig,
   # native dependencies
   eigen,
-  boost179,
+  boost,
   cgal,
   gmp,
   hdf5,
@@ -65,6 +66,20 @@ buildPythonPackage rec {
     hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-mt19937.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/1fe168d331123920eeb9a96e542fcc1453de57fe.patch";
+      hash = "sha256-oZDEL8cPcEu83lW+qSvCbmDGYpaNNRrptW9MLu2pN70=";
+    })
+
+    (fetchpatch {
+      name = "ifcopenshell-boost-1.86-json.patch";
+      url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/88b861737c7c206d0e7307f90d37467e9585515c.patch";
+      hash = "sha256-zMoQcBWRdtavL0xdsr53SqyG6CZoeon8/mmJhrw85lc=";
+    })
+  ];
+
   nativeBuildInputs = [
     # c++
     cmake
@@ -77,7 +92,7 @@ buildPythonPackage rec {
   buildInputs = [
     # ifcopenshell needs stdc++
     (lib.getLib stdenv.cc.cc)
-    boost179
+    boost
     cgal
     eigen
     gmp

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -13191,7 +13191,7 @@ self: super: with self; {
 
   python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
     inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };
@@ -13830,7 +13830,7 @@ self: super: with self; {
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   rdkit = callPackage ../development/python-modules/rdkit {
-    boost = pkgs.boost182.override {
+    boost = pkgs.boost.override {
       enablePython = true;
       inherit python;
     };