diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
| commit | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (patch) | |
| tree | 16c0b044abef442273e494420381770e6e2b45d5 /pkgs/development/tools/misc/automake/automake-1.16.x.nix | |
| parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) | |
| parent | 38eea804e6c02542085c9f232cdd699d96c95a23 (diff) | |
| download | nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.gz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.bz2 nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.lz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.xz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.zst nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.zip | |
Merge branch 'staging' into staging-next
There are security fixes for a few packages (and other changes).
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; |