From 50ed3510f828bfe5b0371d01463624d3e00600bf Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Tue, 9 Apr 2024 13:44:40 +0200
Subject: [PATCH 1/2] aws-encryption-sdk-cli: ignore PytestRemovedIn8Warning

---
 pkgs/tools/admin/aws-encryption-sdk-cli/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
index 2bc331cc1874..3ba47552d132 100644
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
@@ -52,6 +52,9 @@ localPython.pkgs.buildPythonApplication rec {
     "test/integration"
   ];
 
+  # Upstream did not adapt to pytest 8 yet.
+  pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
+
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {

From 7c4ba828872a3edc643ad029ca26b95cd4197459 Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Tue, 9 Apr 2024 13:49:15 +0200
Subject: [PATCH 2/2] aws-encryption-sdk-cli: add missing setuptools dependency

---
 pkgs/tools/admin/aws-encryption-sdk-cli/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
index 3ba47552d132..f0d5aa5d3915 100644
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
@@ -37,6 +37,7 @@ localPython.pkgs.buildPythonApplication rec {
     aws-encryption-sdk
     base64io
     urllib3
+    setuptools # for pkg_resources
   ];
 
   doCheck = true;