diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 85ce9deba6cf..9ebf947c7346 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.15.1"; + version = "0.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2VBdad9NL19eW2Djot2gkynyjSCUvG4f0KnEub6M0vg="; + hash = "sha256-j9++euxSsvf6ZLkVJtyGdlOx6WWrAXEOczqwypYZkXA="; }; buildInputs = lib.optionals stdenv.isDarwin [ @@ -33,11 +33,6 @@ buildPythonPackage rec { "strictoverflow" ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "extra_link_args += ['-Wl,-fatal_warnings']" "" - ''; - # gcc <10 is not supported, LLVM on darwin is just fine nativeBuildInputs = [ cmake @@ -58,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/awslabs/aws-crt-python"; + changelog = "https://github.com/awslabs/aws-crt-python/releases/tag/v${version}"; description = "Python bindings for the AWS Common Runtime"; license = licenses.asl20; maintainers = with maintainers; [ davegallant ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0a0838d676d9..0982e47c5517 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -11,15 +11,6 @@ let py = python3.override { packageOverrides = self: super: { - awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { - version = "0.14.0"; - src = self.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-MGLTFcsWVC/gTdgjny6LwyOO6QRc1QcLkVzy677Lqqw="; - }; - }); - prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { version = "3.0.28"; src = self.fetchPypi { @@ -34,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.6"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.8"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-3zB0Uy2pmkrOLb+/mXZGs/pnzo6zi2zVPyeNPGPVQJM="; + hash = "sha256-Q1iHGwkFg0rkunwEgWQIqLEPAGfOLfqA1UpjmCe2x8M="; }; nativeBuildInputs = [ @@ -120,6 +111,8 @@ with py.pkgs; buildPythonApplication rec { python = py; # for aws_shell updateScript = nix-update-script { attrPath = pname; + # Excludes 1.x versions from the Github tags list + extraArgs = [ "--version-regex" "^(2\.(.*))" ]; }; tests.version = testers.testVersion { package = awscli2;