diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
| commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
| tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/tools/text | |
| parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
| parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
| download | nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.gz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.bz2 nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.lz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.xz nixlib-2858c41823db1654f123c455cca2b145b8d8737b.tar.zst nixlib-2858c41823db1654f123c455cca2b145b8d8737b.zip | |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/silver-searcher/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/xsv/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 146808963125..34aa0e9c7ed6 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.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "074ll6l0486ak4ijvfzhwsp6fp8w55x4yjviql5kb8qpisi9ll7y"; + sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 12061b75a9de..db84eac4a237 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "xsv-${version}"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "xsv"; rev = "${version}"; - sha256 = "0xmjx5grwjrx2zsqmpblid9pqpwkk9pv468ffqlza3w35n9x5dax"; + sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2"; }; - depsSha256 = "0gdbxgykhy6wm89mbdvl7ck2v0f66hwlm0m1q7r64bkb7i10fmkd"; + depsSha256 = "13hy835871zxdnakwsr4bjm4krahlz4aqk5lh0rw78avfla89q9q"; meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; |