Unverified Commit 7be92447 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #236461 from wegank/fenics-boost-2 

python310Packages.fenics: unpin boost172
parents c49a6021 bef5331d

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

+10 −0
Original line number Diff line number Diff line
@@ -164,7 +164,17 @@ let 
        url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw";

        sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r";

      })

      (fetchpatch {

        url = "https://bitbucket.org/fenics-project/dolfin/issues/attachments/1116/fenics-project/dolfin/1602778118.04/1116/0001-Use-__BYTE_ORDER__-instead-of-removed-Boost-endian.h.patch";

        hash = "sha256-wPaDmPU+jaD3ce3nNEbvM5p8e3zBdLozamLTJ/0ai2c=";

      })

    ];

    # https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=dolfin&id=a965ad934f7b3d49a5e77fa6fb5e3c710ec2163e

    postPatch = ''

      sed -i '20 a #include <algorithm>' dolfin/geometry/IntersectionConstruction.cpp

      sed -i '26 a #include <algorithm>' dolfin/mesh/MeshFunction.h

      sed -i '25 a #include <cstdint>' dolfin/mesh/MeshConnectivity.h

    '';

    propagatedBuildInputs = [

      dijitso

      fiat

pkgs/top-level/python-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -3530,7 +3530,6 @@ self: super: with self; { 


  fenics = callPackage ../development/python-modules/fenics {

    hdf5 = pkgs.hdf5_1_10;

    boost = pkgs.boost172;

  };



  ffcv = callPackage ../development/python-modules/ffcv { };