pyrox.dev
Merge pull request #249560 from networkException/update-re2
re2: 2023-03-01 -> 2023-08-01
+6
-3
pkgs/development/libraries/re2/default.nix
+6
-3
pkgs/development/libraries/re2/default.nix
···
8
8
, haskellPackages
9
9
, mercurial
10
10
, python3Packages
11
+
, abseil-cpp
11
12
}:
12
13
13
14
stdenv.mkDerivation rec {
14
15
pname = "re2";
15
-
version = "2023-03-01";
16
+
version = "2023-08-01";
16
17
17
18
src = fetchFromGitHub {
18
19
owner = "google";
19
20
repo = "re2";
20
21
rev = version;
21
-
hash = "sha256-T+P7qT8x5dXkLZAL8VjvqPD345sa6ALX1f5rflE0dwc=";
22
+
hash = "sha256-RexwqNR/Izf2Rzu1cvMw+le6C4EmL4CeWCOc+vXUBZQ=";
22
23
};
23
24
24
25
outputs = [ "out" "dev" ];
25
26
26
27
nativeBuildInputs = [ cmake ninja ];
28
+
29
+
propagatedBuildInputs = [ abseil-cpp ];
27
30
28
31
postPatch = ''
29
32
substituteInPlace re2Config.cmake.in \
···
65
68
'';
66
69
license = licenses.bsd3;
67
70
homepage = "https://github.com/google/re2";
68
-
maintainers = with maintainers; [ azahi ];
71
+
maintainers = with maintainers; [ azahi networkexception ];
69
72
platforms = platforms.all;
70
73
};
71
74
}
+11
pkgs/development/python-modules/fb-re2/default.nix
+11
pkgs/development/python-modules/fb-re2/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
+
, fetchpatch
3
4
, fetchPypi
4
5
, re2
5
6
}:
···
12
13
inherit pname version;
13
14
sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
14
15
};
16
+
17
+
patches = [
18
+
# Bump stdlib to c++17 to fix build with recent re2
19
+
# https://github.com/facebook/pyre2/issues/24
20
+
# https://github.com/facebook/pyre2/pull/25
21
+
(fetchpatch {
22
+
url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch";
23
+
hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0=";
24
+
})
25
+
];
15
26
16
27
buildInputs = [ re2 ];
17
28