From b69d481d742d13db1c65083b3686f7bd52ccec0b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Feb 2019 23:00:30 -0500 Subject: [PATCH] pythonPackages.pyslurm: implement a less strict slurm version check --- .../python-modules/pyslurm/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 7d592c7b450..d8609ca0776 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: +{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, cython, slurm }: buildPythonPackage rec { pname = "pyslurm"; @@ -11,6 +11,19 @@ buildPythonPackage rec { sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; }; + # 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" ];