alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pyslurm: bump to unbreak

Browse source 
Fixes: bd9512f217 ('slurm: 17.02.6 -> 17.02.9 for CVE-2017-15566')
This commit is contained in:
Dmitry Kalinkin 2018-01-09 02:09:11 -05:00
parent 81373e421e
commit e5aa7467d4
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/python-modules/pyslurm/default.nix
View file

@ -1,17 +1,16 @@
{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }:
buildPythonPackage rec {
name = "pyslurm";
name = "pyslurm-${version}";
version = "20171102";
src = fetchFromGitHub {
repo = "pyslurm";
owner = "PySlurm";
rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d";
sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28";
rev = "a2acbc820da419e308c5817998d2abe78a7b75e6";
sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as";
};
patches = [ ./pyslurm-dlfcn.patch ];
buildInputs = [ cython slurm ];
setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];

18
pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch
View file

@ -1,18 +0,0 @@
diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py
index 81643e1..e8b6836 100644
--- a/pyslurm/__init__.py
+++ b/pyslurm/__init__.py
@@ -11,8 +11,11 @@ import sys
old_dlopen_flags = ''
if hasattr(sys, "setdlopenflags"):
old_dlopen_flags = sys.getdlopenflags()
- import DLFCN
- sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL)
+ if sys.version_info >= (3,6):
+ from os import RTLD_GLOBAL
+ else:
+ from DLFCN import RTLD_GLOBAL
+ sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL)
from .pyslurm import *