From 32492d9189c64a1d4999f64cd6dfb00605d2a175 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 30 Aug 2018 19:00:02 +0200
Subject: [PATCH] Python: fix botocore/boto3/awscli mess

Revert "pythonPackages.boto3: 1.7.84 -> 1.8.4"

This reverts commit 06b37899300e0800e7a0ea632fcb5bf0f291e003.

Revert "python: botocore: 1.11.1 -> 1.11.4"

This reverts commit 3b0242d4c014a440b8c1c58cae812dc84496cc95.

Revert "python: botocore: 1.10.75 -> 1.11.1"

This reverts commit 996fd7996713cdedc7e128d9930432c79d637f69.

Revert "awscli: 1.16.1 -> 1.16.4"

This reverts commit 4880df9078bf024fd5a98afa8c6f28833e13f3d3.

Revert "awscli: 1.15.66 -> 1.16.1"

This reverts commit 6923bc8d23e2735708492da627a378de5a53c218.

awscli: fix build

pythonPackages.botocore: 1.10.75 -> 1.10.84
---
 pkgs/development/python-modules/boto3/default.nix  |  4 ++--
 .../python-modules/botocore/default.nix            |  6 ++----
 pkgs/tools/admin/awscli/default.nix                | 14 +++++++-------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index 6aba6e10289..31f050007a6 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.8.4";
+  version = "1.7.84";
 
   src = fetchFromGitHub {
     owner = "boto";
     repo  = "boto3";
     rev   = version;
-    sha256 = "1ja71r7xsijfy0qqqqxanhhg5fk4ad0mgvxyjg7ag0z3z04s1169";
+    sha256 = "0d9kqjqmnn53p1xpmdbbjxcxv2482yx3vjhxw8izp0mpq58i5c14";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 40de7c384e5..989b6e944de 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -7,16 +7,15 @@
 , simplejson
 , mock
 , nose
-, urllib3
 }:
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.11.4";
+  version = "1.10.84";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "284f25a67fa3470314ce78a53e57df8591549652ae31dce1097acefec195b694";
+    sha256 = "d3e4b5a2c903ea30d19d41ea2f65d0e51dce54f4f4c4dfd6ecd7b04f240844a8";
   };
 
   propagatedBuildInputs = [
@@ -25,7 +24,6 @@ buildPythonPackage rec {
     docutils
     ordereddict
     simplejson
-    urllib3
   ];
 
   checkInputs = [ mock nose ];
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index f63a37d388f..ccd9f05a335 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.16.4";
+  version = "1.15.66";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "036cad15f7a551f3d1281b305deb04c6cf05aa3c23fa6d2bba7a0dc4eb5256de";
+    sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
   };
 
   # No tests included
@@ -42,11 +42,11 @@ in py.pkgs.buildPythonApplication rec {
     less
   ];
 
-#   postPatch = ''
-#     for i in {py,cfg}; do
-#       substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11"
-#     done
-#   '';
+  postPatch = ''
+    for i in {py,cfg}; do
+      substituteInPlace setup.$i --replace "botocore==1.10.65" "botocore>=1.10.9,<=1.11"
+    done
+  '';
 
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d