diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-09-06 23:19:12 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2017-09-25 09:43:03 +0800 |
| commit | 4c496c0232712ace8b4a1199700c36b6aa8bc042 (patch) | |
| tree | 973b32a66ee09b916fb543b2f0307dbbba765f95 /pkgs | |
| parent | 4f25b7b6b3be5b22e6e1bd623e4a4843c0413e9e (diff) | |
| download | nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar.gz nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar.bz2 nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar.lz nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar.xz nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.tar.zst nixlib-4c496c0232712ace8b4a1199700c36b6aa8bc042.zip | |
pywbem: make the tests pass again with patch from upstream
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pywbem/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index b728d4f6b943..c9963acf0d8e 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2 +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2 , m2crypto, ply, pyyaml, six , httpretty, lxml, mock, pytest, requests }: @@ -14,6 +14,15 @@ buildPythonPackage rec { sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym"; }; + patches = [ + # fix timezone handling so the tests pass again. Can go when 0.11.0 is released + # https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681 + (fetchpatch { + url = "https://github.com/pywbem/pywbem/commit/bb7fa19d636d999bf844d80939e155b8f212ef3e.patch"; + sha256 = "1c5fsz4zdbgwwni7njdixbwhb5i9bw11mabqpzivrh7z9wna6ab9"; + }) + ]; + propagatedBuildInputs = [ m2crypto ply pyyaml six ]; checkInputs = [ httpretty lxml mock pytest requests ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f6793158a1d..1af49ba3da38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26528,7 +26528,9 @@ EOF ROPGadget = callPackage ../development/python-modules/ROPGadget { }; # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + pywbem = if !(isPy36) + then callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; } + else throw "pywbem not supported for interpreter ${python.executable}"; unicorn = callPackage ../development/python-modules/unicorn { }; |