mercurial: Use google-re2 instead
Facebook's fb-re2 hasn't been maintained for 6 years. Move Mercurial to use google-re2, which is maintained, instead. Mercurial has internal checks that make it work with either fb-re2 or google-re2, so this should be fine. As a bonus this also unblocks full Musl build of Nix, which depends on Mercurial for tests.
This commit is contained in:
@@ -30,7 +30,7 @@ let
|
|||||||
inherit (python3Packages)
|
inherit (python3Packages)
|
||||||
docutils
|
docutils
|
||||||
python
|
python
|
||||||
fb-re2
|
google-re2
|
||||||
pygit2
|
pygit2
|
||||||
pygments
|
pygments
|
||||||
setuptools
|
setuptools
|
||||||
@@ -64,7 +64,7 @@ let
|
|||||||
cargoRoot = if rustSupport then "rust" else null;
|
cargoRoot = if rustSupport then "rust" else null;
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
lib.optional re2Support fb-re2
|
lib.optional re2Support google-re2
|
||||||
++ lib.optional gitSupport pygit2
|
++ lib.optional gitSupport pygit2
|
||||||
++ lib.optional highlightSupport pygments;
|
++ lib.optional highlightSupport pygments;
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
Reference in New Issue
Block a user