diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
| commit | 5621b77a33b311e82c8870f6872a2beffef9dbd0 (patch) | |
| tree | 1d561826278871fa8c065ff84cdadc0922cb758b /pkgs/tools/text | |
| parent | 658335d6a88b623ab926dea99425e2716afa7f4e (diff) | |
| parent | 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 (diff) | |
| download | nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.gz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.bz2 nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.lz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.xz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.zst nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/staccato/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/text/xsv/default.nix | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 8ddfa7d7be4..9a93ec2d767 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "1cnvwxbznmsn1gand8hhy5zadax5p67lvm46fkj1a1s89f158w3a"; + sha256 = "0z3f83vhy464k93bc55i9lr6z41163q96if938p9ndhx2q3a20ql"; }; - depsSha256 = "1kx9xazhj93xa3cnys39wwr84qqjqrlsbbi5ih71vxppskdpvd6m"; + cargoSha256 = "1d6s01gmyfzb0vdf7flq6nvlapwcgbj0mzcprzyg4nj5gjkvznrn"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix index 34e1413150f..973585abc81 100644 --- a/pkgs/tools/text/staccato/default.nix +++ b/pkgs/tools/text/staccato/default.nix @@ -11,9 +11,10 @@ rustPlatform.buildRustPackage rec { sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm"; }; - depsSha256 = "1gwfkh3ck8n3zcy43ch2mnc28a6y10p3srhnx9dh8gwnwbpb733c"; + cargoSha256 = "074mfyanwdykg6wci2ia63wcnnyik741g8n624pac215sg4i95h7"; meta = { + broken = true; description = "A command line program that lets you compute statistics from values from a file or standard input"; longDescription = '' Staccato (`st` for short) is a command line program that lets you diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index db84eac4a23..23f172f4ebe 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -13,7 +13,7 @@ buildRustPackage rec { sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2"; }; - depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q"; + cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj"; meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; |