summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-09-11 22:52:53 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-09-11 22:52:53 +0200
commit628b6c0e9df4034d50adde158724f590f18babb7 (patch)
tree884f8288d4f7c2fbd63b699ecde31df2a8f06056 /pkgs/tools/text
parentc86eb1da5f1c29838bd8a1f88560bc23b78e4fd0 (diff)
parentc3887f02539ed0f79c6f22d6cb709b2cfb7d94e5 (diff)
downloadnixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar.gz
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar.bz2
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar.lz
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar.xz
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.tar.zst
nixlib-628b6c0e9df4034d50adde158724f590f18babb7.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/ascii/default.nix4
-rw-r--r--pkgs/tools/text/xml/basex/default.nix6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix
index 4cc033938553..20777f990e26 100644
--- a/pkgs/tools/text/ascii/default.nix
+++ b/pkgs/tools/text/ascii/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ascii-${version}";
-  version = "3.15";
+  version = "3.18";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/ascii/${name}.tar.gz";
-    sha256 = "0pzzfljg2ijnnys3fzj3f2p288sl5cgk83a2mpcm679pcj5xpqdc";
+    sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 4a7a478a12ac..0650270bb6a0 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "basex-${version}";
-  version = "8.6.4";
+  version = "8.6.6";
 
   src = fetchurl {
-    url = "http://files.basex.org/releases/${version}/BaseX864.zip";
-    sha256 = "14320hfw53m0zl1v4377p0vcjvdnwfpa4gkj2y2wlrplma76y0w7";
+    url = "http://files.basex.org/releases/${version}/BaseX866.zip";
+    sha256 = "1kws6swisdaa17yhijjvkh2ikwz9rd5cw8mdjvkqw6vlcp1nq6m4";
   };
 
   buildInputs = [ unzip jre ];