hwloc: apply nixfmt and remove nested "with lib"

This commit is contained in:
Markus Kowalewski 2024-10-01 13:02:44 +02:00
parent 1e00238993
commit 0b253455f3

View File

@ -1,10 +1,18 @@
{ 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 {
@ -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 ];
@ -45,35 +59,44 @@ stdenv.mkDerivation rec {
sed -i "$lib/lib/libhwloc.la" \
-e "s|-lnuma|-L$numalibdir -lnuma|g"
'';
'';
# Checks disabled because they're impure (hardware dependent) and
# 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,
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 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.
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.
'';
# 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;
};
}