Merge commit 'a0f8e3a' into HEAD

2018-01-22 16:08:37 +01:00
parent 92c0720be9 a0f8e3a30c
commit 4c88132d25
102 changed files with 836 additions and 608 deletions
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -18,20 +18,20 @@ let
    name = "${pname}-${version}";
    pname = "colorama";
    version = "0.3.7";
-    src = fetchPypi {
-      inherit pname version;
+    src = old.src.override {
+      inherit version;
      sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
    };
  });

 in buildPythonPackage rec {
  pname = "awscli";
-  version = "1.14.22";
+  version = "1.14.29";
  namePrefix = "";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "13pivyyivwb3xy0l45083gcman2b0xiv00fl9ww0m8jccgxsdzd0";
+    sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652";
  };

  # No tests included