From b56e34b54022a864ede429d7f78c6662d7f29b36 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 26 Jul 2025 08:34:59 -0500
Subject: [PATCH] awsume: migrate to by-name

awsume: refactor package definitions

awsume: fix python path

Use python3 from build instead of host

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 .../aw/awsume/package.nix}                    | 29 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 20 deletions(-)
 rename pkgs/{tools/admin/awsume/default.nix => by-name/aw/awsume/package.nix} (55%)

diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/by-name/aw/awsume/package.nix
similarity index 55%
rename from pkgs/tools/admin/awsume/default.nix
rename to pkgs/by-name/aw/awsume/package.nix
index 85cecfa4659b..2a31bff4f1c4 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/by-name/aw/awsume/package.nix
@@ -1,18 +1,11 @@
 {
   lib,
-  python,
   installShellFiles,
-  buildPythonApplication,
   fetchFromGitHub,
-  boto3,
-  colorama,
-  psutil,
-  pluggy,
-  pyyaml,
-  setuptools,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "awsume";
   version = "4.5.5";
   format = "setuptools";
@@ -20,15 +13,15 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trek10inc";
     repo = "awsume";
-    rev = version;
-    sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
+    tag = version;
+    hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
   };
 
   AWSUME_SKIP_ALIAS_SETUP = 1;
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     colorama
     boto3
     psutil
@@ -45,20 +38,20 @@ buildPythonApplication rec {
 
   postInstall = ''
     installShellCompletion --cmd awsume \
-      --bash <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
-      --fish <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
+      --bash <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
+      --zsh <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
+      --fish <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
 
     rm -f $out/bin/awsume.bat
   '';
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Utility for easily assuming AWS IAM roles from the command line";
     homepage = "https://github.com/trek10inc/awsume";
-    license = [ licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "awsume";
-    maintainers = [ maintainers.nilp0inter ];
+    maintainers = with lib.maintainers; [ nilp0inter ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..985d33c2f7b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1614,8 +1614,6 @@ with pkgs;
 
   autoflake = with python3.pkgs; toPythonApplication autoflake;
 
-  awsume = python3Packages.callPackage ../tools/admin/awsume { };
-
   aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
 
   azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;