diff options
author | ndowens <ndowens04@gmail.com> | 2017-03-13 18:44:28 -0500 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-14 00:44:28 +0100 |
commit | 64218d61fc0b66722b1c97bab07cd1569d2d0471 (patch) | |
tree | 3d5a38c3f77f4d012aac774f5bcccfefc78e87a0 /pkgs/development/libraries/hwloc | |
parent | bfed19cfaa4f174ee44383307d6908e50bf055bb (diff) | |
download | nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar.gz nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar.bz2 nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar.lz nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar.xz nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.tar.zst nixpkgs-64218d61fc0b66722b1c97bab07cd1569d2d0471.zip |
hwloc: 1.11.2 -> 1.11.6 (#23870)
Diffstat (limited to 'pkgs/development/libraries/hwloc')
-rw-r--r-- | pkgs/development/libraries/hwloc/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 5d07cfe3a2b..e1acacc328c 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 , pciutils, numactl }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "hwloc-1.11.2"; + name = "hwloc-1.11.6"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; + sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -16,17 +18,17 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = # Since `libpci' appears in `hwloc.pc', it must be propagated. - stdenv.lib.optional stdenv.isLinux pciutils; + optional stdenv.isLinux pciutils; enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (stdenv.isLinux && numactl != null) + optionalString (stdenv.isLinux && numactl != null) '' if [ -d "${numactl}/lib64" ] then numalibdir="${numactl}/lib64" @@ -43,9 +45,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; - longDescription = '' hwloc provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of @@ -64,9 +65,7 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; platforms = platforms.all; }; |