diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
| commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
| tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/tools/text | |
| parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
| parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
| download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip | |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/kakasi/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/text/recode/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/wdiff/default.nix | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index b0baeaab5f66..626455732599 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -21,4 +21,14 @@ stdenv.mkDerivation rec { url = "http://kakasi.namazu.org/stable/${name}.tar.xz"; sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; + + postPatch = '' + for a in tests/kakasi-* ; do + substituteInPlace $a \ + --replace "/bin/echo" echo + done + ''; + + doCheck = false; # fails 1 of 6 tests + } diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 9946da614c71..f097ed5c0fa8 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.am --replace "ansi2knr" "" ''; - #doCheck = true; # doesn't work yet + doCheck = false; # fails 10 out of 16 tests preCheck = '' checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs") diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index f4edc02b9fae..df2ef2150691 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, texinfo }: +{ stdenv, fetchurl, texinfo, which }: stdenv.mkDerivation rec { name = "wdiff-1.2.2"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; + checkInputs = [ which ]; + meta = { homepage = http://www.gnu.org/software/wdiff/; description = "Comparing files on a word by word basis"; |