diff options
| -rw-r--r-- | pkgs/development/python-modules/pyslurm/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 1bc08d634189..9057c3970e15 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,21 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180427"; + version = "20180604"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; - sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; + rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc"; + sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj"; }; buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + # Test cases need /etc/slurm/slurm.conf and require a working slurm installation + doCheck = false; + meta = with lib; { homepage = https://github.com/PySlurm/pyslurm; description = "Python bindings to Slurm"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 7a03bf75802b..64e4005f53f3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, curl +{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg @@ -8,11 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.5"; + version = "17.11.7"; - src = fetchurl { - url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; + # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php + # because the latter does not keep older releases. + src = fetchFromGitHub { + owner = "SchedMD"; + repo = "slurm"; + # The release tags use - instead of ., and have an extra -1 suffix. + rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; + sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; }; outputs = [ "out" "dev" ]; |