summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-08-01 19:37:20 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-08-01 19:37:20 +0200
commit50c060d13dc55b673435f05119c968720c97b0c5 (patch)
tree3c5b425db1a6cacf9d6845ece815236744a8da47 /pkgs/tools/text
parent941aec472e16b9119af5f981047eba6c3c889825 (diff)
parent3541e8b4fbf01731580b2f26a3de41200213e6f1 (diff)
downloadnixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.gz
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.bz2
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.lz
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.xz
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.tar.zst
nixpkgs-50c060d13dc55b673435f05119c968720c97b0c5.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/gjo/default.nix2
-rw-r--r--pkgs/tools/text/ugrep/default.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix
index 74a5c87a760..fcca9aace2f 100644
--- a/pkgs/tools/text/gjo/default.nix
+++ b/pkgs/tools/text/gjo/default.nix
@@ -24,4 +24,4 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [ doronbehar ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
index 9702cc92835..95399006dbb 100644
--- a/pkgs/tools/text/ugrep/default.nix
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ugrep";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16nr7zq4l2si9pfckfinbqnv94hw51z2qcbygc9x81jbjlvg3003";
+    sha256 = "0aps4srdss71p6riixcdk50f2484bmq6p2kg95gcb8wbcv3ad3c9";
   };
 
   buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];