slurm: 17.11.5 -> 17.11.7, pyslurm: 20180427 -> 20180604 (#42536)

* slurm: 17.11.5 -> 17.11.7, pyslurm: 20180427 -> 20180604

This commit also swaps to use the official repository's github release tags
instead of their download site, which only keeps the most recent version with no
historical archives.

* Document why we don't run tests

* Remove dead testing code
This commit is contained in:
Benjamin Hipple 2018-06-25 08:58:04 -04:00 committed by xeji
parent 0463c2020e
commit 39f357a836
2 changed files with 16 additions and 8 deletions

View File

@ -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";

View File

@ -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" ];