pyrox.dev
lol
pyslurm: bump to unbreak
Fixes: bd9512f217 ('slurm: 17.02.6 -> 17.02.9 for CVE-2017-15566')
(cherry picked from commit e5aa7467d4cb3750816a3673cf6c7fac138de111)
+3
-23
+3
-5
pkgs/development/python-modules/pyslurm/default.nix
+3
-5
pkgs/development/python-modules/pyslurm/default.nix
···
2
2
3
3
buildPythonPackage rec {
4
4
pname = "pyslurm";
5
-
version = "unstable-69e4f4f";
5
+
version = "20171102";
6
6
name = pname + "-" + version;
7
7
8
8
src = fetchFromGitHub {
9
9
repo = "pyslurm";
10
10
owner = "PySlurm";
11
-
rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d";
12
-
sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28";
11
+
rev = "a2acbc820da419e308c5817998d2abe78a7b75e6";
12
+
sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as";
13
13
};
14
-
15
-
patches = [ ./pyslurm-dlfcn.patch ];
16
14
17
15
buildInputs = [ cython slurm ];
18
16
setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
-18
pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch
-18
pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch
···
1
-
diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py
2
-
index 81643e1..e8b6836 100644
3
-
--- a/pyslurm/__init__.py
4
-
+++ b/pyslurm/__init__.py
5
-
@@ -11,8 +11,11 @@ import sys
6
-
old_dlopen_flags = ''
7
-
if hasattr(sys, "setdlopenflags"):
8
-
old_dlopen_flags = sys.getdlopenflags()
9
-
- import DLFCN
10
-
- sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL)
11
-
+ if sys.version_info >= (3,6):
12
-
+ from os import RTLD_GLOBAL
13
-
+ else:
14
-
+ from DLFCN import RTLD_GLOBAL
15
-
+ sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL)
16
-
17
-
from .pyslurm import *
18
-