Skip to content

Commit 6540bc5

Browse files
committedSep 25, 2017
pywbem: make the tests pass again with patch from upstream
(cherry picked from commit 4c496c0)
1 parent 773e5dd commit 6540bc5

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed
 

Diff for: ‎pkgs/development/python-modules/pywbem/default.nix

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, buildPythonPackage, fetchFromGitHub, libxml2
1+
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, libxml2
22
, m2crypto, ply, pyyaml, six
33
, httpretty, lxml, mock, pytest, requests
44
}:
@@ -14,6 +14,15 @@ buildPythonPackage rec {
1414
sha256 = "0jcwklip03xcni0dvsk9va8ilqz21g4fxwqd5kzvv91slaadfcym";
1515
};
1616

17+
patches = [
18+
# fix timezone handling so the tests pass again. Can go when 0.11.0 is released
19+
# https://github.com/pywbem/pywbem/issues/755#issuecomment-327508681
20+
(fetchpatch {
21+
url = "https://github.com/pywbem/pywbem/commit/bb7fa19d636d999bf844d80939e155b8f212ef3e.patch";
22+
sha256 = "1c5fsz4zdbgwwni7njdixbwhb5i9bw11mabqpzivrh7z9wna6ab9";
23+
})
24+
];
25+
1726
propagatedBuildInputs = [ m2crypto ply pyyaml six ];
1827

1928
checkInputs = [ httpretty lxml mock pytest requests ];

Diff for: ‎pkgs/top-level/python-packages.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -26854,7 +26854,9 @@ EOF
2685426854
};
2685526855

2685626856
# We need "normal" libxml2 and not the python package by the same name.
26857-
pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; };
26857+
pywbem = if !(isPy36)
26858+
then callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }
26859+
else throw "pywbem not supported for interpreter ${python.executable}";
2685826860

2685926861
unicorn = callPackage ../development/python-modules/unicorn { };
2686026862

0 commit comments

Comments
 (0)