public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwloc: 1.11.2 -> 1.11.6 (#23870)

Browse Source
This commit is contained in:
ndowens 2017-03-13 18:44:28 -05:00 committed by Vladimír Čunát
parent bfed19cfaa
commit 64218d61fc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/hwloc/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11
, pciutils, numactl }: , pciutils, numactl }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hwloc-1.11.2"; name = "hwloc-1.11.6";
src = fetchurl { src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; 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. # 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'. # derivation and set optional dependencies to `null'.
buildInputs = stdenv.lib.filter (x: x != null) buildInputs = stdenv.lib.filter (x: x != null)
([ expat ncurses ] ([ expat ncurses ]
++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ])
++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); ++ (optionals stdenv.isLinux [ numactl ]));
propagatedBuildInputs = propagatedBuildInputs =
# Since `libpci' appears in `hwloc.pc', it must be propagated. # Since `libpci' appears in `hwloc.pc', it must be propagated.
stdenv.lib.optional stdenv.isLinux pciutils; optional stdenv.isLinux pciutils;
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = postInstall =
stdenv.lib.optionalString (stdenv.isLinux && numactl != null) optionalString (stdenv.isLinux && numactl != null)
'' if [ -d "${numactl}/lib64" ] '' if [ -d "${numactl}/lib64" ]
then then
numalibdir="${numactl}/lib64" numalibdir="${numactl}/lib64"
@ -43,9 +45,8 @@ stdenv.mkDerivation rec {
# fail on some build machines. # fail on some build machines.
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = {
description = "Portable abstraction of hierarchical architectures for high-performance computing"; description = "Portable abstraction of hierarchical architectures for high-performance computing";
longDescription = '' longDescription = ''
hwloc provides a portable abstraction (across OS, hwloc provides a portable abstraction (across OS,
versions, architectures, ...) of the hierarchical topology of versions, architectures, ...) of the hierarchical topology of
@ -64,9 +65,7 @@ stdenv.mkDerivation rec {
# http://www.open-mpi.org/projects/hwloc/license.php # http://www.open-mpi.org/projects/hwloc/license.php
license = licenses.bsd3; license = licenses.bsd3;
homepage = http://www.open-mpi.org/projects/hwloc/; homepage = http://www.open-mpi.org/projects/hwloc/;
maintainers = [ ]; maintainers = [ ];
platforms = platforms.all; platforms = platforms.all;
}; };