Merge staging-next into master

2019-03-01 09:06:20 +01:00
parent 456ff62ff8 fc4a8f63c4
commit 2fcb11a244
682 changed files with 2751 additions and 1768 deletions
@@ -14,16 +14,23 @@ let
          sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
        };
      });
+      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
+        version = "0.3.9";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1";
+        };
+      });
    };
  };

 in py.pkgs.buildPythonApplication rec {
  pname = "awscli";
-  version = "1.16.90"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too

  src = py.pkgs.fetchPypi {
    inherit pname version;
-    sha256 = "1e2c776ca47ca18ee5ad3d481c0410800b8155342fe73099bc702b17625d7a2d";
+    sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d";
  };

  # No tests included