about summary refs log tree commit diff
path: root/pkgs/tools/text/ripgrep
diff options
context:
space:
mode:
authorSandro Jäckel <sandro.jaeckel@gmail.com>2023-11-26 23:04:07 +0100
committerzowoq <59103226+zowoq@users.noreply.github.com>2023-11-27 15:52:08 +1000
commit271a11a2d6145f0a4c842779599251e8efcb3d48 (patch)
tree9963be3966886ce45f71663009de4b9c8fa833eb /pkgs/tools/text/ripgrep
parent38c39f545c10c135b7162a6d53e13bbe0a125194 (diff)
downloadnixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar.gz
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar.bz2
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar.lz
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar.xz
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.tar.zst
nixlib-271a11a2d6145f0a4c842779599251e8efcb3d48.zip
ripgrep: 13.0.0 -> 14.0.1
Diffstat (limited to 'pkgs/tools/text/ripgrep')
-rw-r--r--pkgs/tools/text/ripgrep/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 456956986cb4..9e1512342ab9 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
 , rustPlatform
-, asciidoctor
 , installShellFiles
 , pkg-config
 , Security
@@ -11,18 +10,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
-  version = "13.0.0";
+  version = "14.0.1";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
     rev = version;
-    sha256 = "0pdcjzfi0fclbzmmf701fdizb95iw427vy3m1svy6gdn2zwj3ldr";
+    sha256 = "sha256-yVRjOwifxjxuvuwF2d7QCNb7PaT3ELoGP34T2RE1ZVY=";
   };
 
-  cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
+  cargoSha256 = "sha256-c4rJYZkAa8vqw3/ccOjGMoyzqq7CVDAMOme9/ORmx9M=";
 
-  nativeBuildInputs = [ asciidoctor installShellFiles ]
+  nativeBuildInputs = [ installShellFiles ]
     ++ lib.optional withPCRE2 pkg-config;
   buildInputs = lib.optional withPCRE2 pcre2
     ++ lib.optional stdenv.isDarwin Security;
@@ -30,10 +29,13 @@ rustPlatform.buildRustPackage rec {
   buildFeatures = lib.optional withPCRE2 "pcre2";
 
   preFixup = ''
-    installManPage $releaseDir/build/ripgrep-*/out/rg.1
+    $out/bin/rg --generate man > rg.1
+    installManPage rg.1
 
-    installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish}
-    installShellCompletion --zsh complete/_rg
+    installShellCompletion --cmd rg \
+      --bash <($out/bin/rg --generate complete-bash) \
+      --fish <($out/bin/rg --generate complete-fish) \
+      --zsh <($out/bin/rg --generate complete-zsh)
   '';
 
   doInstallCheck = true;