tornado: fix breakage from a5b17ec
tornado 4.x now depends on certifi add tornado 3.2.2 back for packages not compatible with 4.x
This commit is contained in:
parent
65775f9a0e
commit
63ea868735
@ -13848,11 +13848,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
# Remove tornado 3.x once pythonPackages.thumbor is updated to 5.x
|
||||
tornado_3 = buildPythonPackage rec {
|
||||
name = "tornado-3.2.2";
|
||||
|
||||
propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
|
||||
sha256 = "13mq6nx98999zql8p2zlg4sj2hr2sxq9w11mqzi7rjfjs0z2sn8i";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
};
|
||||
tornado = buildPythonPackage rec {
|
||||
name = "tornado-4.1";
|
||||
|
||||
propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 ];
|
||||
propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
|
||||
@ -14994,7 +15006,8 @@ let
|
||||
disabled = ! isPy27;
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
tornado
|
||||
# Remove pythonPackages.tornado 3.x once thumbor is updated to 5.x
|
||||
tornado_3
|
||||
pycrypto
|
||||
pycurl
|
||||
pillow
|
||||
@ -15007,7 +15020,8 @@ let
|
||||
xineLib = null;
|
||||
gstreamer = null;
|
||||
ffmpeg = null;
|
||||
}) ];
|
||||
})
|
||||
];
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz";
|
||||
|
Loading…
Reference in New Issue
Block a user