Unverified Commit 0f2e0e65 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #236071 from wegank/monotone-boost 

monotone: unpin boost170
parents 88d35c95 0c2d8f11

pkgs/applications/version-management/monotone/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec { 


  postPatch = ''

    sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc

  '' + lib.optionalString (lib.versionAtLeast boost.version "1.73") ''

    find . -type f -exec sed -i \

      -e 's/ E(/ internal_E(/g' \

      -e 's/{E(/{internal_E(/g' \

      {} +

  '';



  CXXFLAGS=" --std=c++11 ";

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -32652,7 +32652,6 @@ with pkgs; 














  monotone = callPackage ../applications/version-management/monotone {















    lua = lua5;













    boost = boost170;















  };





























  monotoneViz = callPackage ../applications/version-management/monotone-viz {