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 66767598a755..a12a44f328fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1610,8 +1610,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;