Skip to content

Commit 589fc0d

Browse files
authored
python312Packages.*: unpin Boost (NixOS#370066)
2 parents 6bf1c8d + 6f2b12d commit 589fc0d

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

pkgs/development/python-modules/ifcopenshell/default.nix

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
pytestCheckHook,
99
# fetchers
1010
fetchFromGitHub,
11+
fetchpatch,
1112
gitUpdater,
1213
# build tools
1314
cmake,
1415
swig,
1516
# native dependencies
1617
eigen,
17-
boost179,
18+
boost,
1819
cgal,
1920
gmp,
2021
hdf5,
@@ -65,6 +66,20 @@ buildPythonPackage rec {
6566
hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
6667
};
6768

69+
patches = [
70+
(fetchpatch {
71+
name = "ifcopenshell-boost-1.86-mt19937.patch";
72+
url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/1fe168d331123920eeb9a96e542fcc1453de57fe.patch";
73+
hash = "sha256-oZDEL8cPcEu83lW+qSvCbmDGYpaNNRrptW9MLu2pN70=";
74+
})
75+
76+
(fetchpatch {
77+
name = "ifcopenshell-boost-1.86-json.patch";
78+
url = "https://github.com/IfcOpenShell/IfcOpenShell/commit/88b861737c7c206d0e7307f90d37467e9585515c.patch";
79+
hash = "sha256-zMoQcBWRdtavL0xdsr53SqyG6CZoeon8/mmJhrw85lc=";
80+
})
81+
];
82+
6883
nativeBuildInputs = [
6984
# c++
7085
cmake
@@ -77,7 +92,7 @@ buildPythonPackage rec {
7792
buildInputs = [
7893
# ifcopenshell needs stdc++
7994
(lib.getLib stdenv.cc.cc)
80-
boost179
95+
boost
8196
cgal
8297
eigen
8398
gmp

pkgs/top-level/python-packages.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13191,7 +13191,7 @@ self: super: with self; {
1319113191

1319213192
python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
1319313193
inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
13194-
boost = pkgs.boost182.override {
13194+
boost = pkgs.boost.override {
1319513195
enablePython = true;
1319613196
inherit python;
1319713197
};
@@ -13830,7 +13830,7 @@ self: super: with self; {
1383013830
rdflib = callPackage ../development/python-modules/rdflib { };
1383113831

1383213832
rdkit = callPackage ../development/python-modules/rdkit {
13833-
boost = pkgs.boost182.override {
13833+
boost = pkgs.boost.override {
1383413834
enablePython = true;
1383513835
inherit python;
1383613836
};

0 commit comments

Comments
 (0)