diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/tools/text | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixlib-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/text/silver-searcher/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index aa41e7b7f60a..f70f0f3d75b2 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; - rev = "${version}"; - sha256 = "1h7k9ik723qzplwl0a5i0anzdr115wwklfgp0n11p4k2ckh7nygn"; + rev = version; + sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj"; }; - cargoSha256 = "1gld93dxfm4vyiz1b43smbdhxmyzdk2236ksp8vw1zb1yyzn83nf"; + cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index fe890c2916d0..b49305409024 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa"; + sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; }; patches = [ ./bash-completion.patch ]; |