Merge pull request #26437 from vaibhavsagar/unbreak-thumbor

python.pkgs.thumbor: fix package
This commit is contained in:
Frederik Rietdijk 2017-06-09 12:55:50 +02:00 committed by GitHub
commit a78bf7df14

@ -7659,13 +7659,15 @@ in {
libthumbor = buildPythonPackage rec { libthumbor = buildPythonPackage rec {
name = "libthumbor-${version}"; name = "libthumbor-${version}";
version = "1.2.0"; version = "1.3.2";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/l/libthumbor/${name}.tar.gz"; url = "mirror://pypi/l/libthumbor/${name}.tar.gz";
sha256 = "09bbaf08124ee33ea4ef99881625bd20450b0b43ab90fd678479beba8c03f86e"; sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b";
}; };
buildInputs = with self; [ django ];
propagatedBuildInputs = with self; [ six pycrypto ]; propagatedBuildInputs = with self; [ six pycrypto ];
meta = { meta = {
@ -28083,7 +28085,7 @@ EOF
thumbor = buildPythonPackage rec { thumbor = buildPythonPackage rec {
name = "thumbor-${version}"; name = "thumbor-${version}";
version = "5.2.1"; version = "6.3.2";
disabled = ! isPy27; disabled = ! isPy27;
@ -28093,6 +28095,7 @@ EOF
tornado tornado
pycrypto pycrypto
pycurl pycurl
pytz
pillow pillow
derpconf derpconf
python_magic python_magic
@ -28104,14 +28107,18 @@ EOF
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "mirror://pypi/t/thumbor/${name}.tar.gz"; url = "mirror://pypi/t/thumbor/${name}.tar.gz";
sha256 = "57b0d7e261e792b2e2c53a79c3d8c722964003d1828331995dc3491dc67db7d8"; sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
}; };
prePatch = ''
substituteInPlace setup.py \
--replace '"argparse",' ""
'';
meta = { meta = {
description = "A smart imaging service"; description = "A smart imaging service";
homepage = https://github.com/globocom/thumbor/wiki; homepage = https://github.com/globocom/thumbor/wiki;
license = licenses.mit; license = licenses.mit;
broken = true;
}; };
}; };