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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd80143651bd..7e0425b26b9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2911,7 +2911,10 @@ with pkgs; }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; - ripgrep = callPackage ../tools/text/ripgrep { }; + + ripgrep = callPackage ../tools/text/ripgrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; grive2 = callPackage ../tools/filesystems/grive2 { };