diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
commit | cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4 (patch) | |
tree | 6534f00bf85774daac26bb0d592f370ee9fb59b7 /pkgs/tools/text/ripgrep/default.nix | |
parent | 9fd82b3e7e99678dab327332bcffec4aad01d22b (diff) | |
parent | 0bfd0187dafe3f597355e6be16b7b9a5f4b90376 (diff) | |
download | nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.gz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.bz2 nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.lz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.xz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.zst nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/text/ripgrep/default.nix')
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 4a409b8dd84d..d90537bd5533 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,40 +1,44 @@ -{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt +{ stdenv +, fetchFromGitHub +, rustPlatform +, asciidoc +, docbook_xsl +, libxslt +, installShellFiles , Security -, withPCRE2 ? true, pcre2 ? null +, withPCRE2 ? true +, pcre2 ? null }: rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "11.0.2"; + version = "12.0.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; + sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi"; }; - cargoSha256 = "0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21"; + cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) - ++ (stdenv.lib.optional stdenv.isDarwin Security); + ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - mkdir -p "$out/man/man1" - cp target/release/build/ripgrep-*/out/rg.1 "$out/man/man1/" - - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - cp target/release/build/ripgrep-*/out/rg.bash "$out/share/bash-completion/completions/" - cp target/release/build/ripgrep-*/out/rg.fish "$out/share/fish/vendor_completions.d/" - cp "$src/complete/_rg" "$out/share/zsh/site-functions/" + (cd target/release/build/ripgrep-*/out + installManPage rg.1 + installShellCompletion rg.{bash,fish}) + installShellCompletion --zsh "$src/complete/_rg" ''; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; - homepage = https://github.com/BurntSushi/ripgrep; + homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ tailhook globin ma27 ]; platforms = platforms.all; |