Unverified Commit 589fc0de authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

python312Packages.*: unpin Boost (#370066)

parents 6bf1c8de 6f2b12dd
Loading
Loading
Loading
Loading
+17 −2
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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;
    };