public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7683 from codyopel/fix-tornado 

tornado: fix breakage from a5b17ec
This commit is contained in:
Edward Tjörnhammar 2015-05-04 23:34:44 +02:00
parent 0095c4e376 63ea868735
commit 210452aacd
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/top-level/python-packages.nix
View File

@ -13889,11 +13889,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";
@ -15035,20 +15047,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";