summary refs log tree commit diff
path: root/pkgs/tools/admin
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-01-19 18:41:17 +0100
committerPeter Simons <simons@cryp.to>2015-01-19 18:41:17 +0100
commitec6b82a0c2a6bffa2f76a9744105d6d7257c2636 (patch)
tree9a8fd3d92fd40dc4fa0ca646bc351b8df16e370f /pkgs/tools/admin
parenta0bf07827bbf031d90ecb03f4e7345576208214a (diff)
parentd957d9e6bc8c252123a921541ad17eb6041406cd (diff)
downloadnixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar.gz
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar.bz2
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar.lz
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar.xz
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.tar.zst
nixlib-ec6b82a0c2a6bffa2f76a9744105d6d7257c2636.zip
Merge branch 'master' into staging.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r--pkgs/tools/admin/awscli/default.nix9
1 files changed, 5 insertions, 4 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 = {