about summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2015-05-29 11:21:49 -0400
committerShea Levy <shea@shealevy.com>2015-05-29 11:21:49 -0400
commiteb0a21a51208927730607fd9166912d3f8e05435 (patch)
treeaff604155476fca4b6385a960d018a2ac9aded97
parent1b93d6416872fd88bb96cc57d2a03e0b850138c6 (diff)
downloadnixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar.gz
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar.bz2
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar.lz
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar.xz
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.tar.zst
nixlib-eb0a21a51208927730607fd9166912d3f8e05435.zip
boto: Remove obsolete patch
-rw-r--r--pkgs/development/python-modules/boto/content-length-str.patch16
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/boto/content-length-str.patch b/pkgs/development/python-modules/boto/content-length-str.patch
deleted file mode 100644
index 7895e223c6b5..000000000000
--- a/pkgs/development/python-modules/boto/content-length-str.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Cherry-picked from https://github.com/boto/boto/pull/2932
-
-This fix is required for things like docker-registry to interact with S3. Will
-be obsolete after the next boto release (> 2.36.0)
-
---- a/boto/connection.py
-+++ b/boto/connection.py
-@@ -381,7 +381,7 @@ class HTTPRequest(object):
-         if 'Content-Length' not in self.headers:
-             if 'Transfer-Encoding' not in self.headers or \
-                     self.headers['Transfer-Encoding'] != 'chunked':
--                self.headers['Content-Length'] = len(self.body)
-+                self.headers['Content-Length'] = str(len(self.body))
-
-
- class HTTPResponse(http_client.HTTPResponse):
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7f69d5c6548..78ae505f1ff8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1308,8 +1308,6 @@ let
     buildInputs = [ self.nose self.mock ];
     propagatedBuildInputs = [ self.requests self.httpretty ];
 
-    patches = [ ../development/python-modules/boto/content-length-str.patch ];
-
     meta = {
       homepage = https://github.com/boto/boto;