diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
new file mode 100644
index 00000000000..8dede02fb0a
--- /dev/null
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, pkgconfig, cairo, expat }:
+
+stdenv.mkDerivation rec {
+  name = "hwloc-0.9.2";
+
+  src = fetchurl {
+    url = "http://www.open-mpi.org/software/hwloc/v0.9/downloads/${name}.tar.bz2";
+    sha256 = "1smxvz2g05kci1ra78iqmgk02rym3qwh1mrm68rxv70fhqhvq741";
+  };
+
+  buildInputs = [ pkgconfig cairo expat ];
+
+  doCheck = true;
+
+  meta = {
+    description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing";
+
+    longDescription = ''
+       hwloc provides a portable abstraction (across OS,
+       versions, architectures, ...) of the hierarchical topology of
+       modern architectures, including NUMA memory nodes, sockets,
+       shared caches, cores and simultaneous multithreading.  It also
+       gathers various attributes such as cache and memory
+       information.  It primarily aims at helping high-performance
+       computing applications with gathering information about the
+       hardware so as to exploit it accordingly and efficiently.
+
+       hwloc may display the topology in multiple convenient
+       formats.  It also offers a powerful programming interface to
+       gather information about the hardware, bind processes, and much
+       more.
+    '';
+
+    # http://www.open-mpi.org/projects/hwloc/license.php
+    license = "revised-BSD";
+
+    homepage = http://www.open-mpi.org/projects/hwloc/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+
+    # It doesn't support the BSDs.
+    platforms = stdenv.lib.platforms.linux
+             ++ stdenv.lib.platforms.darwin
+             ++ stdenv.lib.platforms.cygwin
+             /* ++ opensolaris */;
+  };
+}
diff --git a/pkgs/development/libraries/libtopology/default.nix b/pkgs/development/libraries/libtopology/default.nix
deleted file mode 100644
index 51651e6c3a1..00000000000
--- a/pkgs/development/libraries/libtopology/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo }:
-
-stdenv.mkDerivation rec {
-  name = "libtopology-0.9";
-
-  src = fetchurl {
-    url = "http://gforge.inria.fr/frs/download.php/22596/${name}.tar.gz";
-    sha256 = "0vxi4cpfv74zgb08k58jkv8xj0x2m7i2mf26smfpjlfpfjrj71y4";
-  };
-
-  buildInputs = [ pkgconfig cairo ];
-
-  doCheck = true;
-
-  meta = {
-    description = "libtopology, a portable abstraction of hierarchical architectures for high-performance computing";
-
-    longDescription = ''
-       libtopology provides a portable abstraction (across OS,
-       versions, architectures, ...) of the hierarchical topology of
-       modern architectures, including NUMA memory nodes, sockets,
-       shared caches, cores and simultaneous multithreading.  It also
-       gathers various attributes such as cache and memory
-       information.  It primarily aims at helping high-performance
-       computing applications with gathering information about the
-       hardware so as to exploit it accordingly and efficiently.
-
-       libtopology may display the topology in multiple convenient
-       formats.  It also offers a powerful programming interface to
-       gather information about the hardware, bind processes, and much
-       more.
-    '';
-
-    # See http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html .
-    license = "CeCILL-B";
-
-    homepage = http://runtime.bordeaux.inria.fr/libtopology/;
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 596efb6946d..6669a50c115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3681,6 +3681,10 @@ let
     inherit stdenv fetchurl unzip;
   };
 
+  hwloc = import ../development/libraries/hwloc {
+    inherit fetchurl stdenv pkgconfig cairo expat;
+  };
+
   icu = import ../development/libraries/icu {
     inherit fetchurl stdenv;
   };
@@ -4069,10 +4073,6 @@ let
     inherit fetchurl stdenv libtool;
   };
 
-  libtopology = import ../development/libraries/libtopology {
-    inherit fetchurl stdenv pkgconfig cairo;
-  };
-
   libunistring = import ../development/libraries/libunistring {
     inherit fetchurl stdenv libiconv;
   };