From 2ed17db8cdeb8e6385f8ac1153e862183813f244 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 5 Oct 2018 17:00:20 +0000 Subject: [PATCH 1/2] slurm: add lz4 dependency Slurm looks for lz4 by default, and if it finds it can improve its compression techniques --- pkgs/servers/computing/slurm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index ba0e57bb2be..afb39ac9fb3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg +, readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -35,15 +35,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl - mysql.connector-c ncurses gtk2 + mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; configureFlags = with stdenv.lib; - [ "--with-munge=${munge}" - "--with-ssl=${openssl.dev}" + [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" - "--with-freeipmi=${freeipmi}" + "--with-lz4=${lz4}" + "--with-munge=${munge}" + "--with-ssl=${openssl.dev}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); From 2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 6 Oct 2018 17:04:04 -0400 Subject: [PATCH 2/2] Add zlib; swap to lz4.dev --- pkgs/servers/computing/slurm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index afb39ac9fb3..e016c5860f7 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl +, python, munge, perl, pam, openssl, zlib , ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4 # enable internal X11 support via libssh2 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl + curl python munge perl pam openssl zlib mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; @@ -42,9 +42,10 @@ stdenv.mkDerivation rec { configureFlags = with stdenv.lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" - "--with-lz4=${lz4}" + "--with-lz4=${lz4.dev}" "--with-munge=${munge}" "--with-ssl=${openssl.dev}" + "--with-zlib=${zlib}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");