Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.

pkgs/tools/text/dadadodo/default.nix

@@ -1,32 +1,22 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dadadodo-${version}";
+  version = "1.04";
 
-  version = a.lib.attrByPath ["version"] "1.04" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://www.jwz.org/dadadodo/dadadodo-${version}.tar.gz";
+    url = "http://www.jwz.org/dadadodo/${name}.tar.gz";
     sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMake" "doDeploy"];
-  installFlags = "PREFIX=$out";
-
-  doDeploy = a.fullDepEntry (''
+  installPhase = ''
     mkdir -p $out/bin
     cp dadadodo $out/bin
-  '') [ "minInit" "doMake" "defEnsureDir"];
-      
-  name = "dadadodo-" + version;
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "Markov chain-based text generator";
+    homepage = http://www.jwz.org/dadadodo;
+    maintainers = with maintainers; [ pSub ];
   };
 }

pkgs/tools/text/diffstat/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.58";
+  name = "diffstat-1.59";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/diffstat/${name}.tgz";
-    sha256 = "14rpf5c05ff30f6vn6pn6pzy0k4g4is5im656ahsxff3k58i7mgs";
+    sha256 = "0w7jvfilbnfa9v3h8j8ipirvrj7n2x5gszfanzxvx748p10i8z96";
   };
 
   meta = with stdenv.lib; {

pkgs/tools/text/discount/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  version = "2.1.6";
+  name = "discount-${version}";
+
+  src = fetchurl {
+    url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
+    sha256 = "15h726m5yalq15hkxxfw4bxwd6wkwkan5q7s80pgi1z32ygb4avh";
+  };
+  patches = ./fix-configure-path.patch;
+  configureScript = "./configure.sh";
+
+  meta = with stdenv.lib; {
+    description = "Implementation of Markdown markup language in C";
+    homepage = "http://www.pell.portland.or.us/~orc/Code/discount/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.shell ];
+  };
+}

pkgs/tools/text/discount/fix-configure-path.patch

@@ -0,0 +1,12 @@
+diff -rupN discount-2.1.6-original/configure.inc discount-2.1.6/configure.inc
+--- discount-2.1.6-original/configure.inc	2014-10-10 15:34:24.158325345 +0100
++++ discount-2.1.6/configure.inc	2014-10-10 15:34:33.553325321 +0100
+@@ -32,7 +32,7 @@
+ # this preamble code is executed when this file is sourced and it picks
+ # interesting things off the command line.
+ #
+-ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++ac_default_path=$PATH
+ 
+ ac_standard="--src=DIR		where the source lives (.)
+ --prefix=DIR		where to install the final product (/usr/local)

pkgs/tools/text/dos2unix/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
-stdenv.mkDerivation {
-  name = "dos2unix-6.0.5";
+stdenv.mkDerivation rec {
+  name = "dos2unix-7.2.1";
   
   src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz;
-    sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx";
+    url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
+    sha256 = "1ws5d66gjs3iqc92d0qxwivixl9092540kxqq2gr6jdzmflqm4jk";
   };
 
   configurePhase = ''

pkgs/tools/text/enca/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libiconvOrNull, recode }:
+{ stdenv, fetchurl, libiconv, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-1.15";
+  name = "enca-1.16";
 
   src = fetchurl {
-    url = "http://dl.cihar.com/enca/${name}.tar.bz2";
-    sha256 = "1iibfl2s420x7bc1hvxr1ys4cpz579brg2m2ln4rp677azmrr8mv";
+    url = "http://dl.cihar.com/enca/${name}.tar.xz";
+    sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw";
   };
 
-  buildInputs = [ recode libiconvOrNull ];
+  buildInputs = [ recode libiconv ];
 
   meta = {
     homepage = http://freecode.com/projects/enca;

pkgs/tools/text/enscript/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/enscript/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/tools/text/gawk/default.nix

@@ -4,16 +4,19 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gawk-4.1.0";
+  name = "gawk-4.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/gawk/${name}.tar.xz";
-    sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
+    sha256 = "1nz83vpss8xv7m475sv4qhhj40g74nvcw0y9kwq9ds8wzfmcdm7g";
   };
 
   # When we do build separate interactive version, it makes sense to always include docs.
   outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
 
+  # Currently broken due to locale tests failing
+  #doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
+
   buildInputs = [ xz.bin libsigsegv ]
     ++ optional interactive readline;
 
@@ -44,6 +47,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ ];
   };
 }

pkgs/tools/text/gist/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gem "gist"

pkgs/tools/text/gist/Gemfile.lock

@@ -0,0 +1,10 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    gist (4.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gist

pkgs/tools/text/gist/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, lib, bundlerEnv }:
+
+let version = "4.3.0";
+in bundlerEnv {
+  name = "gist-${version}";
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+  meta = with lib; {
+    homepage = "http://defunkt.io/gist/";
+    description = "upload code to https://gist.github.com (or github enterprise)";
+    platforms = platforms.all;
+    license = licenses.mit;
+  };
+}

pkgs/tools/text/gist/gemset.nix

@@ -0,0 +1,9 @@
+{
+  "gist" = {
+    version = "4.3.0";
+    source = {
+      type = "gem";
+      sha256 = "0az6l8nq433sszailr7kglh21l3gkcb11k7ag6668nyxxplm9rp0";
+    };
+  };
+}

pkgs/tools/text/gnugrep/cve-2015-1345.patch

@@ -0,0 +1,60 @@
+From 83a95bd8c8561875b948cadd417c653dbe7ef2e2 Mon Sep 17 00:00:00 2001
+From: Yuliy Pisetsky <ypisetsky@fb.com>
+Date: Thu, 01 Jan 2015 23:36:55 +0000
+Subject: grep -F: fix a heap buffer (read) overrun
+
+grep's read buffer is often filled to its full size, except when
+reading the final buffer of a file.  In that case, the number of
+bytes read may be far less than the size of the buffer.  However, for
+certain unusual pattern/text combinations, grep -F would mistakenly
+examine bytes in that uninitialized region of memory when searching
+for a match.  With carefully chosen inputs, one can cause grep -F to
+read beyond the end of that buffer altogether.  This problem arose via
+commit v2.18-90-g73893ff with the introduction of a more efficient
+heuristic using what is now the memchr_kwset function. The use of
+that function in bmexec_trans could leave TP much larger than EP,
+and the subsequent call to bm_delta2_search would mistakenly access
+beyond end of the main input read buffer.
+
+* src/kwset.c (bmexec_trans): When TP reaches or exceeds EP,
+do not call bm_delta2_search.
+* tests/kwset-abuse: New file.
+* tests/Makefile.am (TESTS): Add it.
+* THANKS.in: Update.
+* NEWS (Bug fixes): Mention it.
+
+Prior to this patch, this command would trigger a UMR:
+
+  printf %0360db 0 | valgrind src/grep -F $(printf %019dXb 0)
+
+  Use of uninitialised value of size 8
+     at 0x4142BE: bmexec_trans (kwset.c:657)
+     by 0x4143CA: bmexec (kwset.c:678)
+     by 0x414973: kwsexec (kwset.c:848)
+     by 0x414DC4: Fexecute (kwsearch.c:128)
+     by 0x404E2E: grepbuf (grep.c:1238)
+     by 0x4054BF: grep (grep.c:1417)
+     by 0x405CEB: grepdesc (grep.c:1645)
+     by 0x405EC1: grep_command_line_arg (grep.c:1692)
+     by 0x4077D4: main (grep.c:2570)
+
+See the accompanying test for how to trigger the heap buffer overrun.
+
+Thanks to Nima Aghdaii for testing and finding numerous
+ways to break early iterations of this patch.
+
+Nix: @vcunat restricted this to the runtime code only to avoid needing autoreconfiguration.
+---
+diff --git a/src/kwset.c b/src/kwset.c
+index 4003c8d..376f7c3 100644
+--- a/src/kwset.c
++++ b/src/kwset.c
+@@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
+                     if (! tp)
+                       return -1;
+                     tp++;
++                    if (ep <= tp)
++                      break;
+                   }
+               }
+           }

pkgs/tools/text/gnugrep/default.nix

@@ -1,23 +1,20 @@
-{ stdenv, fetchurl, xz, pcre, libiconv ? null }:
+{ stdenv, fetchurl, xz, pcre, libiconv }:
 
-let version = "2.14"; in
+let version = "2.21"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7";
+    sha256 = "1pp5n15qwxrw1pibwjhhgsibyv5cafhamf8lwzjygs6y00fa2i2j";
   };
 
+  patches = [ ./cve-2015-1345.patch ];
+
   #outputs = [ "out" "doc" ]; ToDo
 
-  buildInputs = [ pcre xz.bin ]
-    ++ stdenv.lib.optional (libiconv != null) libiconv;
-
-  patches = [ ./test-localeconv.patch ];
-
-  NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv";
+  buildInputs = [ pcre xz.bin libiconv ];
 
   doCheck = !stdenv.isDarwin;
 
@@ -27,6 +24,18 @@ stdenv.mkDerivation {
     export MKDIR_P="mkdir -p"
   '';
 
+  # Fix reference to sh in bootstrap-tools, and invoke grep via
+  # absolute path rather than looking at argv[0].
+  postInstall =
+    ''
+      rm $out/bin/egrep $out/bin/fgrep
+      echo "#! /bin/sh" > $out/bin/egrep
+      echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
+      echo "#! /bin/sh" > $out/bin/fgrep
+      echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
+      chmod +x $out/bin/egrep $out/bin/fgrep
+    '';
+
   meta = {
     homepage = http://www.gnu.org/software/grep/;
     description = "GNU implementation of the Unix grep command";
@@ -39,7 +48,7 @@ stdenv.mkDerivation {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    maintainers = [ ];
+    maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.all;
   };
 

pkgs/tools/text/gnugrep/test-localeconv.patch

@@ -1,18 +0,0 @@
---- grep-2.14/gnulib-tests/test-localeconv.c.orig	2013-02-15 18:41:50.213433059 +0000
-+++ grep-2.14/gnulib-tests/test-localeconv.c	2013-02-15 18:50:33.964751303 +0000
-@@ -37,13 +37,13 @@
- 
-     ASSERT (STREQ (l->decimal_point, "."));
-     ASSERT (STREQ (l->thousands_sep, ""));
--#if !defined __FreeBSD__
-+#if !(defined __FreeBSD__ || defined __sun)
-     ASSERT (STREQ (l->grouping, ""));
- #endif
- 
-     ASSERT (STREQ (l->mon_decimal_point, ""));
-     ASSERT (STREQ (l->mon_thousands_sep, ""));
--#if !defined __FreeBSD__
-+#if !(defined __FreeBSD__ || defined __sun)
-     ASSERT (STREQ (l->mon_grouping, ""));
- #endif
-     ASSERT (STREQ (l->positive_sign, ""));

pkgs/tools/text/gnupatch/bashishms.patch

@@ -1,67 +0,0 @@
-http://lists.gnu.org/archive/html/bug-patch/2012-11/msg00001.html
-Tested on Illumos, where ksh is /bin/sh.
-
---- patch-2.7.1/tests/test-lib.sh
-+++ patch-2.7.1/tests/test-lib.sh
-@@ -118,7 +118,7 @@
- }
- 
- if test -z "`echo -n`"; then
--    if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then
-+    if (eval 'test -n "${BASH_LINENO[0]}"') 2>/dev/null; then
- 	eval '
- 	    _start_test() {
- 		echo -n "[${BASH_LINENO[2]}] $* -- "
-
---- patch-2.7.1/tests/crlf-handling
-+++ patch-2.7.1/tests/crlf-handling
-@@ -14,7 +14,7 @@
- use_tmpdir
- 
- lf2crlf() {
--    while read l; do echo -e "$l\r"; done
-+    while read l; do printf "%s\r\n" "$l"; done
- }
- 
- echo 1 > a
-
---- patch-2.7.1/tests/merge
-+++ patch-2.7.1/tests/merge
-@@ -32,18 +32,20 @@
-     shift
-     done > a.sed
-     echo "$body" | sed -f a.sed > b
--    shift
--    while test $# -gt 0 ; do
--	echo "$1"
-+    if test $# -gt 0 ; then
- 	shift
--    done > b.sed
-+    while test $# -gt 0 ; do
-+	echo "$1"
-+	shift
-+    done
-+    fi > b.sed
-     echo "$body" | sed -f b.sed > c
-     rm -f a.sed b.sed
-     output=`diff -u a b | patch $ARGS -f c`
-     status=$?
-     echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d'
-     cat c
--    test $status == 0 || echo "Status: $status"
-+    test $status = 0 || echo "Status: $status"
- }
- 
- x() {
-
---- patch-2.7.1/tests/read-only-files
-+++ patch-2.7.1/tests/read-only-files
-@@ -16,7 +16,7 @@
-
- : > read-only
- chmod a-w read-only
--if : 2> /dev/null > read-only; then
-+if (: > read-only) 2> /dev/null; then
-     echo "Files with read-only permissions are writable" \
-         "(probably running as superuser)" >&2
-     exit 77

pkgs/tools/text/gnupatch/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ed }:
 
 stdenv.mkDerivation rec {
-  name = "patch-2.7.1";
+  name = "patch-2.7.5";
 
   src = fetchurl {
-    url = "mirror://gnu/patch/${name}.tar.gz";
-    sha256 = "1m9r83b5c154xnxbvgjg4lfff58xjapanj6dmmivqx1liik2hpy0";
+    url = "mirror://gnu/patch/${name}.tar.xz";
+    sha256 = "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx";
   };
 
   buildInputs = stdenv.lib.optional doCheck ed;
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
   };
 
-  patches = [ ./bashishms.patch ];
-
   doCheck = true;
 
   meta = {

pkgs/tools/text/grin/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "grin-1.2.1";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz";
+    sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
+  };
+
+  buildInputs = with pythonPackages; [ nose ];
+  propagatedBuildInputs = with pythonPackages; [ argparse ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/grin;
+    description = "A grep program configured the way I like it.";
+    platform = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.sjagoe ];
+  };
+}

pkgs/tools/text/groff/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ghostscript, perl, groff }:
 
 stdenv.mkDerivation rec {
-  name = "groff-1.22.2";
+  name = "groff-1.22.3";
 
   src = fetchurl {
     url = "mirror://gnu/groff/${name}.tar.gz";
-    sha256 = "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q";
+    sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s";
   };
 
   buildInputs = [ ghostscript ];
@@ -28,11 +28,20 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = {
-    homepage = "http://www.gnu.org/software/groff/";
+  postInstall = ''
+      # Remove example output with (random?) colors to 
+      # avoid non-determinism in the output
+      rm $out/share/doc/${name}/examples/hdtbl/*color*ps
+      # Remove creation date
+      find $out/share/doc/${name} -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gnu.org/software/groff/;
     description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pSub ];
 
     longDescription = ''
       groff is the GNU implementation of troff, a document formatting

pkgs/tools/text/highlight/default.nix

@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, getopt, lua, boost }:
-        
+{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
+
 stdenv.mkDerivation rec {
-  name = "highlight-3.9";
+  name = "highlight-3.18";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "1vysj34zz8gk5yhlzm7g6lbphb8y6zfbd9smfgsgwkyawfargrja";
+    sha256 = "0jsq78qb75sawwggbpx5pdqxk00wgjr1a0la0w8wihmamsjzgijm";
   };
 
-  buildInputs = [ getopt lua boost ];
+  buildInputs = [ getopt lua boost pkgconfig ];
 
-  makeFlags = [
-    "PREFIX=$(out)"
-    "conf_dir=$(out)/etc/highlight/"
-  ];
+  preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight"'';
 
   meta = {
     description = "Source code highlighting tool";

pkgs/tools/text/html2text/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "html2text-1.3.2a";
+
+  src = fetchurl {
+    url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz;
+    sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392";
+  };
+
+  preConfigure = ''
+    sed -i s,/bin/echo,echo, configure
+  '';
+
+  # the --prefix has no effect
+  installPhase = ''
+    mkdir -p $out/bin $out/man/man{1,5}
+    cp html2text $out/bin
+    cp html2text.1.gz $out/man/man1
+    cp html2textrc.5.gz $out/man/man5
+  '';
+
+  meta = {
+    description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text.";
+    homepage = http://www.mbayer.de/html2text/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eikek ];
+  };
+}

pkgs/tools/text/mawk/default.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mawk-1.3.4-20141206";
+
+  src = fetchurl {
+    url = "ftp://invisible-island.net/mawk/${name}.tgz";
+    sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g";
+  };
+
+  meta = with stdenv.lib;
+    { description = "Interpreter for the AWK Programming Language";
+      homepage = http://invisible-island.net/mawk/mawk.html;
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ emery ];
+    };
+}

pkgs/tools/text/multitran/mtutils/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://multitran.sourceforge.net/;
-    description = "Multitran: simple command line utilities for dictionary maintainance";
+    description = "Multitran: simple command line utilities for dictionary maintenance";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;

pkgs/tools/text/nkf/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "nkf-${version}";
+  version = "2.1.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforgejp/nkf/59912/${name}.tar.gz";
+    sha256 = "8cb430ae69a1ad58b522eb4927b337b5b420bbaeb69df255919019dc64b72fc2";
+  };
+
+  makeFlags = "prefix=\${out}";
+
+  meta = {
+    description = "Tool for converting encoding of Japanese text";
+    homepage = "http://sourceforge.jp/projects/nkf/";
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}

pkgs/tools/text/numdiff/default.nix

@@ -13,11 +13,11 @@ stdenv.mkDerivation {
     description = ''
       A little program that can be used to compare putatively similar files
       line by line and field by field, ignoring small numeric differences
-      or/and different numeric formats.
+      or/and different numeric formats
     '';
-    homepage = "http://www.nongnu.org/numdiff/";
+    homepage = http://www.nongnu.org/numdiff/;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = stdenv.lib.maintainers.bbenoist;
+    maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/tools/text/peco/default.nix

@@ -3,27 +3,27 @@
 let
   go-flags = fetchgit {
     url = "git://github.com/jessevdk/go-flags";
-    rev = "4f0ca1e2d1349e9662b633ea1b8b8d48e8a32533";
-    sha256 = "5f22f4c5a0529ff0da8e507462ad910bb73c513fde49d58dd4baf7332787ca3d";
+    rev = "ef51ed2000ee1721c7153e958511907b844b4a9c";
+    sha256 = "1abzc7ksglicaz6g6nry006vwvflsidvyzyig85pi3p852z6sc2j";
   };
   go-runewidth = fetchgit {
     url = "git://github.com/mattn/go-runewidth";
-    rev = "36f63b8223e701c16f36010094fb6e84ffbaf8e0";
-    sha256 = "718e9e04659441744b8d43bd3d7e806836194cf322962712a6e019311d407ecf";
+    rev = "63c378b851290989b19ca955468386485f118c65";
+    sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d";
   };
   termbox-go = fetchgit {
     url = "git://github.com/nsf/termbox-go";
-    rev = "4e63c3a917c197694cb4fef6c55582500b3741e3";
-    sha256 = "00ecc0dcf0919a42ea06fe3bd93480a17241160c434ff3872b6f5e418eb18069";
+    rev = "bb19a81afd4bc2729799d1fedb19f7bd7ee284cf";
+    sha256 = "1zc8pb594l16yipis6xg2ra84bg315p63wqxa5abyam1y0333sn0";
   };
 in stdenv.mkDerivation rec {
   name = "peco-${version}";
-  version = "0.2.3";
+  version = "0.2.10";
 
   src = fetchgit {
     url = "git://github.com/peco/peco";
-    rev = "b8e0c8f37d3eed68e64c931b0edb77728f3723f9";
-    sha256 = "f178e01ab0536770b17eddcefd863e68c2d65b527b5da1fc3fb9efb19c12635f";
+    rev = "4952013023ae1d92c10d826e6970c5a68959678d";
+    sha256 = "02fwmxhaydx9m6q146amq1aw44abzisskkblmv1sjxrm37x81l31";
   };
 
   buildInputs = [ go ];

pkgs/tools/text/qprint/default.nix

@@ -0,0 +1,28 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "qprint-1.1";
+
+  src = fetchurl {
+    url = "http://www.fourmilab.ch/webtools/qprint/${name}.tar.gz";
+    sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz";
+  };
+
+  doCheck = true;
+
+  checkTarget = "wringer";
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man1
+  '';
+
+  meta = {
+    homepage = "http://www.fourmilab.ch/webtools/qprint/";
+    license = stdenv.lib.licenses.publicDomain;
+    description = "encode and decode Quoted-Printable files";
+    maintainers = [ stdenv.lib.maintainers.tv ];
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}

pkgs/tools/text/recode/default.nix

@@ -1,6 +1,6 @@
 # XXX: this may need -liconv on non-glibc systems.. 
 
-{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }:
+{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "recode-3.7-2fd838565";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
   };
 
-  buildInputs = [ python perl autoconf automake libtool intltool flex ];
+  nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo ];
 
   preConfigure = ''
     # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455

pkgs/tools/text/replace/default.nix

@@ -14,6 +14,10 @@ stdenv.mkDerivation {
     makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc";
   };
 
+  preBuild = ''
+    sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h
+  '';
+
   preInstall = "mkdir -p \$out/share/man";
   postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
 

pkgs/tools/text/sgml/opensp/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl}:
+{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation {
   name = "opensp-1.5.2";
@@ -13,8 +13,19 @@ stdenv.mkDerivation {
       docsrc/*.xml
   '';
 
+  configureFlags = lib.optional stdenv.isDarwin [
+    "--with-libintl-prefix=/usr"
+    "--with-libiconv-prefix=/usr"
+  ];
+
   setupHook = ./setup-hook.sh;
 
+  postFixup = ''
+    # Remove random ids in the release notes
+    sed -i -e 's/href="#idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
+    sed -i -e 's/name="idm.*"//g' $out/share/doc/OpenSP/releasenotes.html
+    '';
+
   buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
 
   meta = {

pkgs/tools/text/silver-searcher/default.nix

@@ -1,13 +1,13 @@
 {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}:
 
-let release = "0.24.1"; in
+let release = "0.29.1"; in
 stdenv.mkDerivation {
   name = "silver-searcher-${release}";
 
   src = fetchgit {
     url = "https://github.com/ggreer/the_silver_searcher.git";
     rev = "refs/tags/${release}";
-    sha256 = "1cwav217mkbwyg8isiak0wynydiil2j9gy4sx79harbcql0f3nl3";
+    sha256 = "05508c2714d356464a0de6f41a6a8408ccd861b967e968302c4b72feade89581";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

pkgs/tools/text/source-highlight/default.nix

@@ -12,13 +12,11 @@ stdenv.mkDerivation {
     sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1";
   };
 
-  configureFlags = [ "--with-boost=${boost}" ];
-
   buildInputs = [ boost ];
 
-  enableParallelBuilding = false;
+  configureFlags = [ "--with-boost=${boost.lib}" ];
 
-  doCheck = true;
+  enableParallelBuilding = false;
 
   meta = {
     description = "Source code renderer with syntax highlighting";

pkgs/tools/text/wdiff/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-1.2.1";
+  name = "wdiff-1.2.2";
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "1gb5hpiyikada9bwz63q3g96zs383iskiir0xsqynqnvq1vd4n41";
+    sha256 = "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl";
   };
 
   buildInputs = [ texinfo ];

pkgs/tools/text/wgetpaste/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Command-line interface to various pastebins";
     homepage = http://wgetpaste.zlin.dk/;
-    license = "publicDomain";
+    license = stdenv.lib.licenses.publicDomain;
     maintainers = with stdenv.lib.maintainers; [ qknight iElectric ];
     platforms = stdenv.lib.platforms.all;
   };

pkgs/tools/text/xidel/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, dpkg, patchelf }:
+
+stdenv.mkDerivation rec {
+  name = "xidel-${version}";
+  version = "0.8.4";
+
+  ## Source archive lacks file (manageUtils.sh), using pre-built package for now.
+  #src = fetchurl {
+  #  url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/${name}.src.tar.gz";
+  #  sha256 = "1h5xn16lgzx0s94iyhxa50lk05yf0af44nzm5w5k57615nd82kz2";
+  #};
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_amd64.deb";
+        sha256 = "0gq95ag2661hsw8b7ii6z07ian832cz8g21lvq2cvps4a80ql1gi";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_i386.deb";
+        sha256 = "07yk5sk1p4jm0jmgjwdm2wq8d2wybi1wkn1qq5j5y03z1pdc3fi6";
+      }
+    else throw "xidel is not supported on ${stdenv.system}";
+
+  buildInputs = [ dpkg patchelf ];
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -a usr/* "$out/"
+    interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
+    patchelf --set-interpreter "$interpreter" "$out/bin/xidel"
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command line tool to download and extract data from html/xml pages";
+    homepage = http://videlibri.sourceforge.net/xidel.html;
+    # source contains no license info (AFAICS), but sourceforge says GPLv2
+    license = licenses.gpl2;
+    # more platforms will be supported when we switch to source build
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = [ maintainers.bjornfor ];
+  };
+}

pkgs/tools/text/xml/html-xml-utils/default.nix

@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
-    license = "free-non-copyleft"; #TODO W3C
+    license = stdenv.lib.licenses.w3c;
   };
 }

pkgs/tools/text/xml/rxp/default.nix

@@ -1,20 +1,17 @@
 {stdenv, fetchurl} :
 
-stdenv.mkDerivation {
-  name = "rxp-1.2.3";
+stdenv.mkDerivation rec {
+  name = "rxp-${version}";
+  version = "1.5.0";
+
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/r/rxp/rxp_1.2.3.orig.tar.gz;
-    sha256 = "1r4khvmnl5231y37ji8f3mikxy0dhdz155wi3qihfi27mc1yv534";
+    url = "mirror://debian/pool/main/r/rxp/rxp_${version}.orig.tar.gz";
+    sha256 = "0y365r36wzj4xn1dzhb03spxljnrx8vwqbiwnnwz4630129gzpm6";
   };
-  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp rxp $out/bin
-  '';
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
-    description = "a validating XML parser written in C";
-    homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html";
+    description = "A validating XML parser written in C";
+    homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html;
   };
 }

pkgs/tools/text/xml/xml2/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "xml2-0.5";
+
+  src = fetchurl {
+    url = "http://download.ofb.net/gale/${name}.tar.gz";
+    sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873";
+  };
+
+  buildInputs = [ pkgconfig libxml2 ];
+
+  meta = with stdenv.lib; {
+    homepage = http://ofb.net/~egnor/xml2/;
+    description = "Tools for command line processing of XML, HTML, and CSV";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+  };
+}

pkgs/tools/text/xml/xmlstarlet/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "xmlstarlet-1.5.0";
+  name = "xmlstarlet-1.6.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/xmlstar/${name}.tar.gz";
-    sha256 = "1fmvqvzrzyfcg53j39sdz01v7klzyhd011m3y9br54525q2fvd27";
+    sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m";
   };
 
   buildInputs = [ pkgconfig libxml2 libxslt ];

pkgs/tools/text/xml/xpf/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   
   src = fetchurl {
     url = http://tarballs.nixos.org/xpf-0.2.tar.gz;
-    md5 = "d92658828139e1495e052d0cfe25d312";
+    sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
   };
   
   buildInputs = [python libxml2];