python-packages: python2.6 fixes
This commit is contained in:
parent
3c1b5246ad
commit
b6c87f9f29
@ -994,7 +994,7 @@ pythonPackages = python.modules // rec {
|
|||||||
webtest
|
webtest
|
||||||
zope_component
|
zope_component
|
||||||
zope_interface
|
zope_interface
|
||||||
];
|
] ++ optional isPy26 unittest2;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
chameleon
|
chameleon
|
||||||
@ -1198,6 +1198,8 @@ pythonPackages = python.modules // rec {
|
|||||||
md5 = "df72458bf3dd26a744dcff5ad555c34b";
|
md5 = "df72458bf3dd26a744dcff5ad555c34b";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ];
|
||||||
|
|
||||||
# TODO: https://github.com/malthe/chameleon/issues/139
|
# TODO: https://github.com/malthe/chameleon/issues/139
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
@ -4550,7 +4552,11 @@ pythonPackages = python.modules // rec {
|
|||||||
md5 = "a1266d4db421963fd3deb172c6689e4b";
|
md5 = "a1266d4db421963fd3deb172c6689e4b";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgs.unzip ];
|
buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict
|
||||||
|
pythonPackages.unittest2 ];
|
||||||
|
|
||||||
|
# XXX: skipping two tests fails in python2.6
|
||||||
|
doCheck = ! isPy26;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
nose
|
nose
|
||||||
@ -4558,7 +4564,6 @@ pythonPackages = python.modules // rec {
|
|||||||
six
|
six
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
waitress
|
waitress
|
||||||
unittest2
|
|
||||||
mock
|
mock
|
||||||
pyquery
|
pyquery
|
||||||
wsgiproxy2
|
wsgiproxy2
|
||||||
@ -5093,7 +5098,7 @@ pythonPackages = python.modules // rec {
|
|||||||
md5 = "e7e581af8193551831560a736a53cf58";
|
md5 = "e7e581af8193551831560a736a53cf58";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ zope_event zope_interface zope_testing ];
|
propagatedBuildInputs = [ zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict;
|
||||||
|
|
||||||
# ignore circular dependency on zope_location
|
# ignore circular dependency on zope_location
|
||||||
installCommand = ''
|
installCommand = ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user