diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-01-09 17:24:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 17:24:23 +0000 |
| commit | 613383206cb8c83053f083419eb00af84e31ea21 (patch) | |
| tree | 74709e65afc2696672ecd24402d45989f8350748 /pkgs/development/python-modules | |
| parent | 46928cf32ef32b4b15cabab11bf0dafa27074b4e (diff) | |
| parent | 3ebad47b8acd0eb6739cb3bc3d66c3cd6ce38da4 (diff) | |
| download | nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar.gz nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar.bz2 nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar.lz nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar.xz nixlib-613383206cb8c83053f083419eb00af84e31ea21.tar.zst nixlib-613383206cb8c83053f083419eb00af84e31ea21.zip | |
Merge pull request #33656 from veprbl/pyslurm_fix
pyslurm: bump to unbreak (master)
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyslurm/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch | 18 |
2 files changed, 3 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index e855b952f276..41b42bb63ec0 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,16 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "unstable-69e4f4f"; + version = "20171102"; name = pname + "-" + version; 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" ]; diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch deleted file mode 100644 index 2b3798a30706..000000000000 --- a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch +++ /dev/null @@ -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 * - |