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

tornado: fix breakage from a5b17ec

Browse Source 
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:
codyopel 2015-05-04 03:33:31 -04:00
parent 65775f9a0e
commit 63ea868735
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

@ -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 { tornado = buildPythonPackage rec {
name = "tornado-4.1"; 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 { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
@ -14994,20 +15006,22 @@ let
disabled = ! isPy27; disabled = ! isPy27;
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
tornado # Remove pythonPackages.tornado 3.x once thumbor is updated to 5.x
pycrypto tornado_3
pycurl pycrypto
pillow pycurl
derpconf pillow
python_magic derpconf
thumborPexif python_magic
(pkgs.opencv.override { thumborPexif
gtk = null; (pkgs.opencv.override {
glib = null; gtk = null;
xineLib = null; glib = null;
gstreamer = null; xineLib = null;
ffmpeg = null; gstreamer = null;
}) ]; ffmpeg = null;
})
];
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/t/thumbor/${name}.tar.gz";