From 65dcb3f08f4ba84dac0c337e1c4f99460e1a6ebd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 8 Feb 2020 14:11:49 +0100 Subject: [PATCH] python: awscli: 1.16.266 -> 1.17.13 We force the use of docutils 0.16. If this does not work out, we can still override the version as this is an application. --- pkgs/tools/admin/awscli/default.nix | 31 +++++++++-------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 06ddd0e85896..08843d5bca97 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -14,39 +14,26 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); - - pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { - version = "5.1.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81"; - }; - }); - - colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ba247bx5pc60hcpbf3rjsqk0whilg241i9qdfnlcwij5qgdgvh5"; - }; - }); - }; }; -in py.pkgs.buildPythonApplication rec { +in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.16.266"; # N.B: if you change this, change botocore to a matching version too + version = "1.17.13"; # N.B: if you change this, change botocore to a matching version too - src = py.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "9c59a5ca805f467669d471b29550ecafafb9b380a4a6926a9f8866f71cd4f7be"; + sha256 = "c42fc35d4e9f82ce72b2a8b8d54df3a57fe363b0763a473e72d0006b0d1e06ff"; }; + postPatch = '' + substituteInPlace setup.py --replace ",<0.16" "" + ''; + # No tests included doCheck = false; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = [ botocore bcdoc s3transfer