Unverified Commit 1af7a07a authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #258214 from markuskowa/split-rdma-core 

rdma-core: split outputs -> out, man, dev
parents a51dec6d 476626b6

pkgs/development/libraries/ucx/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec { 
  ++ lib.optionals enableRocm [ rocm-core rocm-runtime rocm-device-libs hip ];



  configureFlags = [

    "--with-rdmacm=${rdma-core}"

    "--with-rdmacm=${lib.getDev rdma-core}"

    "--with-dc"

    "--with-rc"

    "--with-dm"

    "--with-verbs=${rdma-core}"

    "--with-verbs=${lib.getDev rdma-core}"

  ] ++ lib.optional enableCuda "--with-cuda=${cudatoolkit'}"

  ++ lib.optional enableRocm "--with-rocm=${rocm}";

pkgs/os-specific/linux/rdma-core/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



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



  nativeBuildInputs = [

    cmake

    docutils

pkgs/servers/computing/slurm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec { 
      "--with-lz4=${lz4.dev}"

      "--with-munge=${munge}"

      "--with-yaml=${libyaml.dev}"

      "--with-ofed=${rdma-core}"

      "--with-ofed=${lib.getDev rdma-core}"

      "--sysconfdir=/etc/slurm"

      "--with-pmix=${pmix}"

      "--with-bpf=${libbpf}"