about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-06-22 18:12:03 +0200
committerGitHub <noreply@github.com>2018-06-22 18:12:03 +0200
commitb7487779e1c59ba9eec8afd9305e842e3e70fc37 (patch)
treebd2b85abc113ab2e07b41e80ceeee7314f2f4366 /pkgs/development
parent5c80983e75a749b8e90feb9e0b676ff04daa4776 (diff)
parent4239726e0dcb923a40d0870c462ff0fa2dc2f0fa (diff)
Merge pull request #42350 from Ma27/fix-py-thumbor
pythonPackages.thumbor: 6.4.2 -> 6.5.1
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/thumbor/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix
index 94261b10e3d05..37d8f3a513434 100644
--- a/pkgs/development/python-modules/thumbor/default.nix
+++ b/pkgs/development/python-modules/thumbor/default.nix
@@ -1,26 +1,19 @@
 { buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
 , 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 {
   pname = "thumbor";
-  version = "6.4.2";
+  version = "6.5.1";
 
   disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
+    sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
-      sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "setup.py" \
       --replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}