summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2015-01-15 14:00:24 +0100
committerPascal Wittmann <PascalWittmann@gmx.net>2015-01-15 14:00:24 +0100
commit375ba22185f4900866d8ee92aff853679fd6872d (patch)
treec9b1d70bd872ed83bb4b97e988933d5dfe8e14a2
parent99496c83465c19002f048b81060c26526cc028cb (diff)
parent4451de5c521a91a624023dfe9548330d317c38b8 (diff)
downloadnixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar.gz
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar.bz2
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar.lz
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar.xz
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.tar.zst
nixlib-375ba22185f4900866d8ee92aff853679fd6872d.zip
Merge pull request #5678 from muflax/awscli
awscli: bump version and fix missing runtime dependency
-rw-r--r--pkgs/tools/admin/awscli/default.nix9
-rw-r--r--pkgs/top-level/python-packages.nix4
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 334e7f6ce1d3..a37aa26cf7ca 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchzip, pythonPackages, groff }:
 
 pythonPackages.buildPythonPackage rec {
   name = "awscli-${version}";
-  version = "1.6.10";
+  version = "1.7.0";
   namePrefix = "";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz";
-    sha256 = "1g25yqxpcjrwjiibwgjrlqdyx6hpdlcb6zr2s05w592gr9gpbwpm";
+    sha256 = "14cbfvwx18vs2l8hhvamy1mbvjwa3xrm58l8yyalhrh5pqq952mi";
   };
 
   propagatedBuildInputs = [
@@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec {
     pythonPackages.docutils
     pythonPackages.rsa
     pythonPackages.pyasn1
+    groff
   ];
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38d9a2a67cd6..bb51e9a501e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1088,12 +1088,12 @@ let
   };
 
   botocore = buildPythonPackage rec {
-    version = "0.80.0";
+    version = "0.81.0";
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "1zmsg0n21wq25v1dgnmf3hvw8yszxyryiylmp4alybcsg8nkg5fz";
+      sha256 = "0mdkkk0038ng6557cw5520xy624sqgv0avjx387bc3fbgxi8bksj";
     };
 
     propagatedBuildInputs =