about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdrien Devresse <adrien.devresse@epfl.ch>2016-05-27 23:01:16 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-05-28 02:08:41 +0200
commitb6193dbac7961a412c106932f6af5a07e875fc1b (patch)
treeb7c2cde6297e413234e95532d3c2d747364130d2
parentd7749f27f3df976be82eef36f2dbc4b13de5ad9d (diff)
downloadnixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar.gz
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar.bz2
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar.lz
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar.xz
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.tar.zst
nixlib-b6193dbac7961a412c106932f6af5a07e875fc1b.zip
slurm-llnl: improvements
- add support for numa and hwloc
- add support for lua scripting module
- make slurm compatible with system configuration by default, in case of  Nix used
  as a side package manager (tested on redhat)
- strip the libtool generated files

Closes #15673
-rw-r--r--pkgs/servers/computing/slurm/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 04eccf0c5d7c..95d6cd943fa7 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl,
-  ncurses, mysql, gtk }:
+{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl
+, ncurses, mysql, gtk, lua, hwloc, numactl
+}:
 
 stdenv.mkDerivation rec {
   name = "slurm-llnl-${version}";
@@ -10,11 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";
   };
 
-  buildInputs = [ pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk ];
+  buildInputs = [
+    pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk lua
+    hwloc numactl
+  ];
 
   configureFlags =
     [ "--with-munge=${munge}"
       "--with-ssl=${openssl.dev}"
+      "--sysconfdir=/etc/slurm"
     ] ++ stdenv.lib.optional (gtk == null)  "--disable-gtktest";
 
   preConfigure = ''
@@ -22,6 +27,10 @@ stdenv.mkDerivation rec {
     substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}"
   '';
 
+  postInstall = ''
+    rm -f $out/lib/*.la $out/lib/slurm/*.la
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.schedmd.com/;
     description = "Simple Linux Utility for Resource Management";