From ca0050e806e20f0dcc896bad3458da3edcd11a71 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 16 Mar 2020 12:07:49 +1000 Subject: [PATCH] ripgrep: 11.0.2 -> 12.0.0 https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1200-2020-03-15 --- pkgs/tools/text/ripgrep/default.nix | 34 ++++++++++++++++------------- 1 file 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;