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

Merge pull request #45925 from markuskowa/ompi-up

Browse Source 
slurm: 17.11.9-2 -> 18.08.0-1
This commit is contained in:
xeji 2018-09-09 14:20:00 +02:00 committed by GitHub
commit 17c51ef436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ let
# configuration file can be generated by http://slurm.schedmd.com/configurator.html # configuration file can be generated by http://slurm.schedmd.com/configurator.html
configFile = pkgs.writeTextDir "slurm.conf" configFile = pkgs.writeTextDir "slurm.conf"
'' ''
ClusterName=${cfg.clusterName}
${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
@ -105,6 +106,15 @@ in
''; '';
}; };
clusterName = mkOption {
type = types.str;
default = "default";
example = "myCluster";
description = ''
Necessary to distinguish accounting records in a multi-cluster environment.
'';
};
nodeName = mkOption { nodeName = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;

6
pkgs/development/python-modules/pyslurm/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyslurm"; pname = "pyslurm";
version = "20180811"; version = "20180908";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "pyslurm"; repo = "pyslurm";
owner = "PySlurm"; owner = "PySlurm";
rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05"; rev = "50dc113e99d82e70e84fc2e812333733708be4ed";
sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr"; sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k";
}; };
buildInputs = [ cython slurm ]; buildInputs = [ cython slurm ];

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

@ -8,7 +8,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slurm-${version}"; name = "slurm-${version}";
version = "17.11.9-2"; version = "18.08.0-1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases. # because the latter does not keep older releases.
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
repo = "slurm"; repo = "slurm";
# The release tags use - instead of . # The release tags use - instead of .
rev = "${builtins.replaceStrings ["."] ["-"] name}"; rev = "${builtins.replaceStrings ["."] ["-"] name}";
sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];