pythonPackages.thumbor: 6.4.2 -> 6.5.1

The current `thumbor` build on master: https://hydra.nixos.org/build/76000076

This is mainly caused by several dependency bumps (e.g.
`pythonPackages.tornado` to v5 in dd936ccdb9)
that broke the `setup.py` from version 6.4.

Bumping to the latest stable version (6.5.1) fixes these issues.
This commit is contained in:
Maximilian Bosch 2018-06-22 00:01:32 +02:00
parent 3813d5dcec
commit 4239726e0d
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 3 additions and 10 deletions

View File

@ -1,26 +1,19 @@
{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib , piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "thumbor"; pname = "thumbor";
version = "6.4.2"; version = "6.5.1";
disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d"; sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
}; };
patches = [
(fetchpatch {
url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
})
];
postPatch = '' postPatch = ''
substituteInPlace "setup.py" \ substituteInPlace "setup.py" \
--replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''} --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}