summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-12-16 21:13:24 +0100
committerPeter Simons <simons@cryp.to>2013-12-16 21:13:24 +0100
commit45e8de9a7d457e5202d17fcbf4a6c58afa3388e8 (patch)
tree35ce6756899dca5d77087fa2f06c781f42a9a6a3 /pkgs/tools/text
parent2bc29e4e6d3713d106de670b55e8789267f7acc7 (diff)
parent60103a4bd99cce63dab60be358e0ba90724b8b21 (diff)
downloadnixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.gz
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.bz2
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.lz
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.xz
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.tar.zst
nixlib-45e8de9a7d457e5202d17fcbf4a6c58afa3388e8.zip
Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/diffstat/default.nix4
-rw-r--r--pkgs/tools/text/enscript/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index d1d366ba5998..6bbf1a9a8c7f 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.45";
+  name = "diffstat-1.58";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/diffstat/"+ name +".tgz";
-    md5 = "cfe06ffcdbeaaa2fd296db867157ef78";
+    sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
   };
 
   meta = {
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index 665336cbd364..f25c41b72b93 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "enscript-1.6.5.2";
+  name = "enscript-1.6.6";
 
   src = fetchurl {
     url = "mirror://gnu/enscript/${name}.tar.gz";
-    sha256 = "0xfblj3liwf1zxpx8bdcl2dwqi2lkfm1zsl6ld9757kgnfyk6gnv";
+    sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
   };
 
   buildInputs = [ gettext ];