Merge pull request #270837 from anthonyroussel/updates/awscli_2_14

awscli2: 2.13.38 -> 2.14.2
This commit is contained in:
Mario Rodas 2023-11-29 08:32:35 -05:00 committed by GitHub
commit 1382337b86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 15 deletions

View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "awscrt";
version = "0.19.17";
version = "0.19.18";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-v3CANF5cfUG31AiqAFpRmnLeOfGm7I8H+VIUTo6qVJI=";
hash = "sha256-NQtu/Y6+4ILqPz5SxZo8PsWUza8B24tIU9zrn+yQyJ0=";
};
buildInputs = lib.optionals stdenv.isDarwin [
@ -27,12 +27,6 @@ buildPythonPackage rec {
Security
];
# Required to suppress -Werror
# https://github.com/NixOS/nixpkgs/issues/39687
hardeningDisable = lib.optionals stdenv.cc.isClang [
"strictoverflow"
];
# gcc <10 is not supported, LLVM on darwin is just fine
nativeBuildInputs = [
cmake

View file

@ -7,15 +7,15 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.19.13";
format = "pyproject";
version = "0.19.18";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-N0erJxk0FN47IClSt0YiSYH58j9ysQFscSShN7rAD3s=";
hash = "sha256-T1pZyHwFgraev5lNYU4Pt2zC0KXsPzLk0dscCRhnzdM=";
};
nativeBuildInputs = [

View file

@ -36,21 +36,21 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli2";
version = "2.13.38"; # N.B: if you change this, check if overrides are still up-to-date
format = "pyproject";
version = "2.14.2"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
hash = "sha256-BsdvmF2ZoiO5uTkrd1G0cgP3/nAPR+nDMO2Se4Tt990=";
hash = "sha256-ECP22D4lQzJ/13/oXkOgn97EhRRuXv4vW0FtlwugrNs=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \
--replace 'flit_core>=3.7.1,<3.8.1' 'flit_core>=3.7.1' \
--replace 'awscrt>=0.16.4,<=0.19.12' 'awscrt>=0.16.4' \
--replace 'awscrt==0.19.18' 'awscrt>=0.19' \
--replace 'docutils>=0.10,<0.20' 'docutils>=0.10' \
--replace 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'