diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-07-13 04:35:54 +0300 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-07-13 03:13:05 -0400 |
commit | b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c (patch) | |
tree | 26d7861e098625c83a04ee3603629c72b26f867e /pkgs/servers | |
parent | fc2819d998a713ed04a95d728b63f0c921334906 (diff) | |
download | nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar.gz nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar.bz2 nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar.lz nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar.xz nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.tar.zst nixlib-b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c.zip |
slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 311d707e9c59..69afd479af30 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl +{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { - name = "slurm-llnl-${version}"; - version = "15-08-5-1"; + name = "slurm-${version}"; + version = "17.02.6"; src = fetchurl { - url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; - sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; + url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2"; + sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' + # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es + # this doesn't fix tests completely at least makes slurmd to launch + hardeningDisable = [ "bindnow" ]; + + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; @@ -25,8 +30,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' - substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" - substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" + patchShebangs ./doc/html/shtml2html.py + patchShebangs ./doc/man/man2html.py ''; postInstall = '' |