diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2019-02-13 10:29:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-13 10:29:10 +0100 |
commit | 1c1913b949254ccd1b7228f0f7c371975664a90d (patch) | |
tree | e4c8fc4f859e9b9811524bf7ebf4cac352a9e76a /pkgs | |
parent | ac0fd7c426928850e334a61b7b14d0fece75fe70 (diff) | |
parent | b69d481d742d13db1c65083b3686f7bd52ccec0b (diff) | |
download | nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar.gz nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar.bz2 nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar.lz nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar.xz nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.tar.zst nixlib-1c1913b949254ccd1b7228f0f7c371975664a90d.zip |
Merge pull request #55677 from veprbl/pr/pyslurm_adjust_version_check
pythonPackages.pyslurm: implement a less strict slurm version check
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/pyslurm/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 7d592c7b450b..d8609ca07766 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" ]; |