Unverified Commit 34367e84 authored by Markus Kowalewski's avatar Markus Kowalewski Committed by GitHub
Browse files

hwloc: 2.11.1 -> 2.11.2 (#345687)

parents 86490ad3 0b253455

pkgs/development/libraries/hwloc/default.nix

+54 −31
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, pkg-config, expat, ncurses, pciutils, numactl

, x11Support ? false

, libX11

, cairo

, config

, enableCuda ? config.cudaSupport

, cudaPackages

{

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  expat,

  ncurses,

  pciutils,

  numactl,

  x11Support ? false,

  libX11,

  cairo,

  config,

  enableCuda ? config.cudaSupport,

  cudaPackages,

}:



stdenv.mkDerivation rec {

  pname = "hwloc";

  version = "2.11.1";

  version = "2.11.2";



  src = fetchurl {

    url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2";

    sha256 = "sha256-BM37/60iXOFfZhhPD0FBMn2r8ojRCouE0T9Rest4cMY=";

    hash = "sha256-9/iP7K4GcQDxoakVtlit0PT3FWEllIKRCmm66iL+hAk=";

  };



  configureFlags = [
@@ -22,11 +30,17 @@ stdenv.mkDerivation rec { 
  ];



  # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.

  nativeBuildInputs = [ pkg-config ]

  ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ];



  buildInputs = [ expat ncurses ]

    ++ lib.optionals x11Support [ cairo libX11 ]

  buildInputs =

    [

      expat

      ncurses

    ]

    ++ lib.optionals x11Support [

      cairo

      libX11

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]

    ++ lib.optionals enableCuda [ cudaPackages.cuda_cudart ];
@@ -51,9 +65,15 @@ stdenv.mkDerivation rec { 
  # fail on some build machines.

  doCheck = false;



  outputs = [ "out" "lib" "dev" "doc" "man" ];

  outputs = [

    "out"

    "lib"

    "dev"

    "doc"

    "man"

  ];



  meta = with lib; {

  meta = {

    description = "Portable abstraction of hierarchical architectures for high-performance computing";

    longDescription = ''

      hwloc provides a portable abstraction (across OS,
@@ -71,9 +91,12 @@ stdenv.mkDerivation rec { 
      more.

    '';

    # https://www.open-mpi.org/projects/hwloc/license.php

    license = licenses.bsd3;

    license = lib.licenses.bsd3;

    homepage = "https://www.open-mpi.org/projects/hwloc/";

    maintainers = with maintainers; [ fpletz markuskowa ];

    platforms = platforms.all;

    maintainers = with lib.maintainers; [

      fpletz

      markuskowa

    ];

    platforms = lib.platforms.all;

  };

}