diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-18 16:55:42 -0400 |
commit | 7319013ea14f94cb360c7bef9e403de7f1db83b0 (patch) | |
tree | cb6d4763cee2cc982648762c019b3b77b9ba18b2 /pkgs/development/libraries/libuv | |
parent | ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd (diff) | |
parent | 35378f014161c1d794dc89b6969275396cb601de (diff) | |
download | nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.gz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.bz2 nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.lz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.xz nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.tar.zst nixlib-7319013ea14f94cb360c7bef9e403de7f1db83b0.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/libuv')
-rw-r--r-- | pkgs/development/libraries/libuv/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index f75ce4396a6d..73d2db8e9993 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" "condvar_5" + ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + # I observe this test failing with some regularity on ARMv7: + # https://github.com/libuv/libuv/issues/1871 + "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' |