From 75be03a801794de4c2b8ade418b94df4e17cf121 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Fri, 21 Jun 2024 17:44:44 +0200
Subject: [PATCH] awscli2: remove `with py.pkgs`

---
 pkgs/tools/admin/awscli2/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index c3b741f0adca..676fabd30d89 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -57,7 +57,7 @@ let
   };
 
 in
-with py.pkgs; buildPythonApplication rec {
+py.pkgs.buildPythonApplication rec {
   pname = "awscli2";
   version = "2.17.0"; # N.B: if you change this, check if overrides are still up-to-date
   pyproject = true;
@@ -86,12 +86,15 @@ with py.pkgs; buildPythonApplication rec {
     sed -i '/pip>=/d' requirements/bootstrap.txt
   '';
 
-  build-system = [
+  nativeBuildInputs = [
     installShellFiles
+  ];
+
+  build-system = with py.pkgs; [
     flit-core
   ];
 
-  dependencies = [
+  dependencies = with py.pkgs; [
     awscrt
     bcdoc
     botocore
@@ -99,9 +102,7 @@ with py.pkgs; buildPythonApplication rec {
     cryptography
     distro
     docutils
-    groff
     jmespath
-    less
     prompt-toolkit
     python-dateutil
     pyyaml
@@ -109,7 +110,12 @@ with py.pkgs; buildPythonApplication rec {
     urllib3
   ];
 
-  nativeCheckInputs = [
+  propagatedBuildInputs = [
+    groff
+    less
+  ];
+
+  nativeCheckInputs = with py.pkgs; [
     jsonschema
     mock
     pytestCheckHook