From ac6e4996164b33d3b909c155c9b084484d5d4872 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sat, 5 Oct 2024 07:11:33 +1000
Subject: [PATCH 1/4] awsebcli: remove eqyiel from maintainers

---
 pkgs/tools/virtualization/awsebcli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index f76545e60b0d..452fd7b8111d 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -95,7 +95,7 @@ localPython.pkgs.buildPythonApplication rec {
     homepage = "https://aws.amazon.com/elasticbeanstalk/";
     description = "Command line interface for Elastic Beanstalk";
     changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";
-    maintainers = with maintainers; [ eqyiel kirillrdy ];
+    maintainers = with maintainers; [ kirillrdy ];
     license = licenses.asl20;
     mainProgram = "eb";
   };

From e1e3ce02790b63f3a18fbd2b5cf6886c74b6ae65 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sat, 5 Oct 2024 07:15:55 +1000
Subject: [PATCH 2/4] awsebcli: clean up

---
 pkgs/tools/virtualization/awsebcli/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 452fd7b8111d..d4b1bb1b7727 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3, fetchFromGitHub, glibcLocales, git }:
+{ lib, python3, fetchFromGitHub, git }:
 
 let
   changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
@@ -33,16 +33,9 @@ localPython.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469
-    substituteInPlace setup.py --replace "scripts=['bin/eb']," ""
+    substituteInPlace setup.py --replace-fail "scripts=['bin/eb']," ""
   '';
 
-  nativeBuildInputs = with localPython.pkgs; [
-  ];
-
-  buildInputs = [
-    glibcLocales
-  ];
-
   propagatedBuildInputs = with localPython.pkgs; [
     blessed
     botocore

From 4f3042a038ea64b4627a5a46e16d427099a1471c Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sat, 5 Oct 2024 07:18:07 +1000
Subject: [PATCH 3/4] awsebcli: move to by-name

---
 .../awsebcli/default.nix => by-name/aw/awsebcli/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/virtualization/awsebcli/default.nix => by-name/aw/awsebcli/package.nix} (100%)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/by-name/aw/awsebcli/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/awsebcli/default.nix
rename to pkgs/by-name/aw/awsebcli/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eef9ab339bd0..be7c3703d56e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3151,8 +3151,6 @@ with pkgs;
 
   okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
 
-  awsebcli = callPackage ../tools/virtualization/awsebcli { };
-
   awslimitchecker = callPackage ../tools/admin/awslimitchecker { };
 
   awslogs = callPackage ../tools/admin/awslogs { };

From 017f0a4ddbc141dc4fc8f00471d445635f9a029d Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sat, 5 Oct 2024 07:18:49 +1000
Subject: [PATCH 4/4] awsebcli: nixfmt-rfc-style

---
 pkgs/by-name/aw/awsebcli/package.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index d4b1bb1b7727..21a20ad7dd16 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -1,12 +1,19 @@
-{ lib, python3, fetchFromGitHub, git }:
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  git,
+}:
 
 let
-  changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
-    inherit version;
-    src = oldAttrs.src.override {
-      inherit version hash;
-    };
-  });
+  changeVersion =
+    overrideFunc: version: hash:
+    overrideFunc (oldAttrs: rec {
+      inherit version;
+      src = oldAttrs.src.override {
+        inherit version hash;
+      };
+    });
 
   localPython = python3.override {
     self = localPython;