summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorVladyslav M <dywedir@pm.me>2018-09-08 15:21:25 +0300
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-08 14:21:25 +0200
commit3b4ab85f01673e7573f5e740fa50bbaf0174c03b (patch)
tree1f7232957bb444f5c67978b6f18849c431818a41 /pkgs/tools/text
parent37032db5835aec5b04a0c1201e504a878a5aabb7 (diff)
downloadnixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar.gz
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar.bz2
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar.lz
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar.xz
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.tar.zst
nixlib-3b4ab85f01673e7573f5e740fa50bbaf0174c03b.zip
ripgrep: 0.9.0 -> 0.10.0 (#46331)
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/ripgrep/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index f70f0f3d75b2..81c88ecad9e5 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt  }:
+{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt
+, Security
+, withPCRE2 ? false, pcre2 ? null
+}:
 
 rustPlatform.buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = version;
-    sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj";
+    sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb";
   };
 
-  cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih";
+  cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr";
+
+  cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
 
   nativeBuildInputs = [ asciidoc docbook_xsl libxslt ];
+  buildInputs = (stdenv.lib.optional withPCRE2 pcre2)
+    ++ (stdenv.lib.optional stdenv.isDarwin Security);
 
   preFixup = ''
     mkdir -p "$out/man/man1"