From 4cb9f662ce8eae9477febdb70ba5f217496a731f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Feb 2016 22:39:33 +0100 Subject: [PATCH] hwloc: 1.6 -> 1.11.2 and disable tests This package was failing to build on wendy: lt-linux-libnuma: linux-libnuma.c:70: main: Assertion `numa_bitmask_equal(bitmask, numa_all_nodes_ptr)' failed. Since we shouldn't run tests that depend on the hardware characteristics of the build machine, I've disabled these. --- pkgs/development/libraries/hwloc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index c357d808cac..5d07cfe3a2b 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -2,11 +2,11 @@ , pciutils, numactl }: stdenv.mkDerivation rec { - name = "hwloc-1.6"; + name = "hwloc-1.11.2"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.6/downloads/${name}.tar.bz2"; - sha256 = "0y561bryiqp1f5af5lm432dcw93xwp1jw55si7wa6skxnd6ch25w"; + url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; + sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { -e "s|-lnuma|-L$numalibdir -lnuma|g" ''; - # XXX: A test hangs on Cygwin, see - # . - doCheck = !stdenv.isCygwin; + # Checks disabled because they're impure (hardware dependent) and + # fail on some build machines. + doCheck = false; meta = with stdenv.lib; { description = "Portable abstraction of hierarchical architectures for high-performance computing";