diff options
-rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/hwloc/ncurses.patch | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 5c3d37729e6dc..fc1f1edbdfe8a 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses }: stdenv.mkDerivation rec { - name = "hwloc-1.0"; + name = "hwloc-1.1"; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v1.0/downloads/${name}.tar.bz2"; - sha256 = "1s64w026idxrkf0y56q4cybapz7yldn1xycnfh1d5bj7v7ncds21"; + url = "http://www.open-mpi.org/software/hwloc/v1.1/downloads/${name}.tar.bz2"; + sha256 = "0l31yhcpq6bjsamxk0lqlidv9j43vg7m7906zdb5aj18i085ymyv"; }; buildInputs = [ pkgconfig cairo expat ncurses ]; diff --git a/pkgs/development/libraries/hwloc/ncurses.patch b/pkgs/development/libraries/hwloc/ncurses.patch deleted file mode 100644 index 58dffea526515..0000000000000 --- a/pkgs/development/libraries/hwloc/ncurses.patch +++ /dev/null @@ -1,13 +0,0 @@ -Help `configure' find `tparm' in libncurses. - ---- a/config/hwloc.m4 2010-04-19 14:25:53.000000000 +0200 -+++ b/config/hwloc.m4 2010-04-19 14:24:23.000000000 +0200 -@@ -285,7 +285,7 @@ EOF]) - LIBS= - AC_CHECK_HEADERS([curses.h], [ - AC_CHECK_HEADERS([term.h], [ -- AC_SEARCH_LIBS([tparm], [termcap curses], [ -+ AC_SEARCH_LIBS([tparm], [ncurses termcap curses], [ - AC_SUBST([HWLOC_TERMCAP_LIBS], ["$LIBS"]) - AC_DEFINE([HWLOC_HAVE_LIBTERMCAP], [1], - [Define to 1 if you have a library providing the termcap interface]) |