diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/tools/text | |
parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) | |
download | nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2 nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/colordiff/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/text/gawk/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/mawk/default.nix | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 89bbd862dadd..9b041ae4b2be 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl /*, xmlto */}: -stdenv.mkDerivation { - name = "colordiff-1.0.15"; +stdenv.mkDerivation rec { + name = "colordiff-1.0.16"; src = fetchurl { - url = http://www.colordiff.org/colordiff-1.0.15.tar.gz; - sha256 = "0icx4v2h1gy08vhh3qqi2qfyfjp37vgj27hq1fnjz83bg7ly8pjr"; + url = "http://www.colordiff.org/${name}.tar.gz"; + sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga"; }; buildInputs = [ perl /* xmlto */ ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index e62b18a4c436..4556f12af63e 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { doCheck = !( stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1 || stdenv.isDarwin # XXX: `locale' segfaults + || stdenv.isSunOS # XXX: `_backsmalls1' fails, locale stuff? ); buildInputs = [ xz.bin ] diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d0259362df61..c2e47211e152 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pcre libiconv ]; # cygwin: FAIL: multibyte-white-space - doCheck = !stdenv.isDarwin && !stdenv.isCygwin; + doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 3337fa62a289..67d2df103639 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { { description = "Interpreter for the AWK Programming Language"; homepage = http://invisible-island.net/mawk/mawk.html; license = licenses.gpl2; - maintainers = with maintainers; [ emery ]; + maintainers = with maintainers; [ ehmry ]; }; } \ No newline at end of file |