diff options
author | codyopel <codyopel@gmail.com> | 2015-05-04 03:33:31 -0400 |
---|---|---|
committer | codyopel <codyopel@gmail.com> | 2015-05-04 03:33:31 -0400 |
commit | 63ea868735ccdec62a2ebc2982ea680321475c00 (patch) | |
tree | 75eb43c4648a635b0386e78fab77f5b381f416cb /pkgs | |
parent | 65775f9a0e2064c1eabd94e0c69694533fbab80b (diff) | |
download | nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar.gz nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar.bz2 nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar.lz nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar.xz nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.tar.zst nixlib-63ea868735ccdec62a2ebc2982ea680321475c00.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 816b49afe360..09b762bb72ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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,20 +15006,22 @@ let disabled = ! isPy27; propagatedBuildInputs = with self; [ - tornado - pycrypto - pycurl - pillow - derpconf - python_magic - thumborPexif - (pkgs.opencv.override { - gtk = null; - glib = null; - xineLib = null; - gstreamer = null; - ffmpeg = null; - }) ]; + # Remove pythonPackages.tornado 3.x once thumbor is updated to 5.x + tornado_3 + pycrypto + pycurl + pillow + derpconf + python_magic + thumborPexif + (pkgs.opencv.override { + gtk = null; + glib = null; + xineLib = null; + gstreamer = null; + ffmpeg = null; + }) + ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz"; |