pywbem: make the tests pass again with patch from upstream

(cherry picked from commit 4c496c0)
NixOS · Sep 25, 2017 · 6540bc5 · 6540bc5
1 parent 773e5dd
commit 6540bc5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -26854,7 +26854,9 @@ EOF
   };
 
   # 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 { };