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

Merge pull request #42350 from Ma27/fix-py-thumbor

Browse Source 
pythonPackages.thumbor: 6.4.2 -> 6.5.1
This commit is contained in:
Frederik Rietdijk 2018-06-22 18:12:03 +02:00 committed by GitHub
commit b7487779e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/thumbor/default.nix
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",' ""''}