Merge pull request #249560 from networkException/update-re2

re2: 2023-03-01 -> 2023-08-01

pkgs/development/libraries/re2/default.nix

@@ -8,23 +8,26 @@
 , haskellPackages
 , mercurial
 , python3Packages
+, abseil-cpp
 }:
 
 stdenv.mkDerivation rec {
   pname = "re2";
-  version = "2023-03-01";
+  version = "2023-08-01";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = version;
-    hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc=";
+    hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ=";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ninja ];
 
+  propagatedBuildInputs = [ abseil-cpp ];
+
   postPatch = ''
     substituteInPlace re2Config.cmake.in \
       --replace "\''${PACKAGE_PREFIX_DIR}/" ""
@@ -65,7 +68,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.bsd3;
     homepage = "https://github.com/google/re2";
-    maintainers = with maintainers; [ azahi ];
+    maintainers = with maintainers; [ azahi networkexception ];
     platforms = platforms.all;
   };
 }

pkgs/development/python-modules/fb-re2/default.nix

@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , re2
 }:
@@ -13,6 +14,16 @@ buildPythonPackage rec {
     sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
   };
 
+  patches = [
+    # Bump stdlib to c++17 to fix build with recent re2
+    # https://github.com/facebook/pyre2/issues/24
+    # https://github.com/facebook/pyre2/pull/25
+    (fetchpatch {
+      url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch";
+      hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0=";
+    })
+  ];
+
   buildInputs = [ re2 ];
 
   # no tests in PyPI tarball