mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-15 14:09:17 +03:00
slurm: add freeipmi, readline, libssh2, fix hwloc
* add freeipmi to get power meter readings * readline support for scontrol * libssh2 support for X11 supporta * Add note to enableSrunX11 in module * fix hwloc support (was detected by configure)
This commit is contained in:
parent
b7e91f096a
commit
8026127e47
2 changed files with 22 additions and 5 deletions
|
@ -134,6 +134,8 @@ in
|
||||||
from within an interactive session or a batch job. This activates the
|
from within an interactive session or a batch job. This activates the
|
||||||
slurm-spank-x11 module. Note that this option also enables
|
slurm-spank-x11 module. Note that this option also enables
|
||||||
'services.openssh.forwardX11' on the client.
|
'services.openssh.forwardX11' on the client.
|
||||||
|
|
||||||
|
This option requires slurm to be compiled without native X11 support.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl
|
{ stdenv, fetchurl, pkgconfig, libtool, curl
|
||||||
|
, python, munge, perl, pam, openssl
|
||||||
, ncurses, mysql, gtk2, lua, hwloc, numactl
|
, ncurses, mysql, gtk2, lua, hwloc, numactl
|
||||||
|
, readline, freeipmi, libssh2, xorg
|
||||||
|
# enable internal X11 support via libssh2
|
||||||
|
, enableX11 ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -13,6 +17,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
prePatch = stdenv.lib.optional enableX11 ''
|
||||||
|
substituteInPlace src/common/x11_util.c \
|
||||||
|
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
|
||||||
|
'';
|
||||||
|
|
||||||
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
|
# nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
|
||||||
# https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
|
# https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
|
||||||
# this doesn't fix tests completely at least makes slurmd to launch
|
# this doesn't fix tests completely at least makes slurmd to launch
|
||||||
|
@ -20,14 +29,20 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig libtool ];
|
nativeBuildInputs = [ pkgconfig libtool ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl
|
curl python munge perl pam openssl
|
||||||
];
|
mysql.connector-c ncurses gtk2
|
||||||
|
lua hwloc numactl readline freeipmi
|
||||||
|
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags = with stdenv.lib;
|
||||||
[ "--with-munge=${munge}"
|
[ "--with-munge=${munge}"
|
||||||
"--with-ssl=${openssl.dev}"
|
"--with-ssl=${openssl.dev}"
|
||||||
|
"--with-hwloc=${hwloc.dev}"
|
||||||
|
"--with-freeipmi=${freeipmi}"
|
||||||
"--sysconfdir=/etc/slurm"
|
"--sysconfdir=/etc/slurm"
|
||||||
] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest";
|
] ++ (optional (gtk2 == null) "--disable-gtktest")
|
||||||
|
++ (optional enableX11 "--with-libssh2=${libssh2.dev}");
|
||||||
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
patchShebangs ./doc/html/shtml2html.py
|
patchShebangs ./doc/html/shtml2html.py
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue