From 01a3482008ad1738e111965cc2588c42741198d1 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 07:54:38 +0000 Subject: [PATCH 1/3] python312Packages.python-mapnik: unpin Boost Marked as broken, but compiles successfully and gets to the same failing test even with Boost unpinned. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 094d52701692..0c0876640148 100644 --- 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; }; From dc213dbe001b01ebec8429c70ab721b9ee1a60ec Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 07:54:38 +0000 Subject: [PATCH 2/3] python312Packages.rdkit: unpin Boost --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c0876640148..15475d6aae87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; }; From 6f2b12dd6a37561b6e21cc88cfec180f828b39d0 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 27 Nov 2024 07:54:38 +0000 Subject: [PATCH 3/3] =?UTF-8?q?python312Packages.ifcopenshell:=20add=20ups?= =?UTF-8?q?tream=20patch=20for=20Boost=20=E2=89=A5=201.86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/ifcopenshell/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index c9b5183e4f9e..8f373abdbaff 100644 --- 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