diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2013-04-22 11:17:23 +0200 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2013-04-22 11:17:23 +0200 |
| commit | b6c87f9f29aa1d6445ee6bce995757bc95ba85a9 (patch) | |
| tree | 1ff79d033717ead9b66930f486e8ab442c3ef7ee /pkgs | |
| parent | 3c1b5246adc43715496f83f8c742ebe26e26bd2c (diff) | |
| download | nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar.gz nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar.bz2 nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar.lz nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar.xz nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.tar.zst nixlib-b6c87f9f29aa1d6445ee6bce995757bc95ba85a9.zip | |
python-packages: python2.6 fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 183adab84742..437d07a9b08f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -994,7 +994,7 @@ pythonPackages = python.modules // rec { webtest zope_component zope_interface - ]; + ] ++ optional isPy26 unittest2; propagatedBuildInputs = [ chameleon @@ -1198,6 +1198,8 @@ pythonPackages = python.modules // rec { md5 = "df72458bf3dd26a744dcff5ad555c34b"; }; + buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ]; + # TODO: https://github.com/malthe/chameleon/issues/139 doCheck = false; @@ -4550,7 +4552,11 @@ pythonPackages = python.modules // rec { 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 = [ nose @@ -4558,7 +4564,6 @@ pythonPackages = python.modules // rec { six beautifulsoup4 waitress - unittest2 mock pyquery wsgiproxy2 @@ -5093,7 +5098,7 @@ pythonPackages = python.modules // rec { 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 installCommand = '' |