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/development/tools/misc/automake/automake-1.16.x.nix | |
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/development/tools/misc/automake/automake-1.16.x.nix')
-rw-r--r-- | pkgs/development/tools/misc/automake/automake-1.16.x.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 6646b8472526..478fc14d680d 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, autoconf, doCheck ? false }: +{ stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { name = "automake-1.16.1"; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { # Disable indented log output from Make, otherwise "make.test" will # fail. preCheck = "unset NIX_INDENT_MAKE"; - inherit doCheck; + doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths + doInstallCheck = false; # runs the same thing, fails the same tests # The test suite can run in parallel. enableParallelBuilding = true; |