JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm

Browse Source
This commit is contained in:
Dmitry Kalinkin 2017-07-13 04:35:54 +03:00
parent fc2819d998
commit b917a8760e
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -36,9 +36,9 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.slurm-llnl; default = pkgs.slurm;
defaultText = "pkgs.slurm-llnl"; defaultText = "pkgs.slurm";
example = literalExample "pkgs.slurm-llnl-full"; example = literalExample "pkgs.slurm-full";
description = '' description = ''
The package to use for slurm binaries. The package to use for slurm binaries.
''; '';

21
pkgs/servers/computing/slurm/default.nix
View File

@ -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 , ncurses, mysql, gtk2, lua, hwloc, numactl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slurm-llnl-${version}"; name = "slurm-${version}";
version = "15-08-5-1"; version = "17.02.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2";
sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh";
}; };
outputs = [ "out" "dev" ]; 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 = [ buildInputs = [
curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl 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"; ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest";
preConfigure = '' preConfigure = ''
substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" patchShebangs ./doc/html/shtml2html.py
substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" patchShebangs ./doc/man/man2html.py
''; '';
postInstall = '' postInstall = ''

4
pkgs/top-level/all-packages.nix
View File

@ -11485,9 +11485,9 @@ with pkgs;
storm = callPackage ../servers/computing/storm { }; storm = callPackage ../servers/computing/storm { };
slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };