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

Merge pull request #66649 from markuskowa/upd-slurm

Browse Source 
slurm: 19.05.1.2 -> 19.05.2.1
This commit is contained in:
Marek Mahut 2019-08-15 15:41:22 +02:00 committed by GitHub
commit bcb0f53c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,28 +2,15 @@
buildPythonPackage rec {
pname = "pyslurm";
version = "18-08-3";
version = "19-05-0";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
rev = version;
sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg";
sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r";
};
# Needed for patch below to apply
prePatch = ''
sed -i -e '/__max_slurm_hex_version__ = "0x1208/c__max_slurm_hex_version__ = "0x120804"' setup.py
'';
patches = [
# Implements a less strict slurm version check
(fetchpatch {
url = "https://github.com/PySlurm/pyslurm/commit/d3703f2d58b5177d29092fe1aae1f7a96da61765.diff";
sha256 = "1s41z9bhzhplgg08p1llc3i8zw20r1479s04y0l1vx0ak51b6w0k";
})
];
buildInputs = [ cython slurm ];
setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];

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

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