diff --git a/flake.nix b/flake.nix index 7544efa1..24b81216 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,6 @@ in (self.lib.flakes.filterPackagesByPlatform system { - inherit (pkgs) awscli2; inherit (pkgs) aws-sam-cli; inherit (pkgs) badhosts-unified; diff --git a/nix/overlays/500-aws.nix b/nix/overlays/500-aws.nix index 3b15de0f..978fe2c6 100644 --- a/nix/overlays/500-aws.nix +++ b/nix/overlays/500-aws.nix @@ -1,11 +1,8 @@ final: prev: let - # Upstream keeps breaking this and it's usually not up-to-date, either. - awscli2 = final.callPackage ../pkgs/awscli2 { }; - aws-sam-cli = final.callPackage ../pkgs/aws-sam-cli { }; in { - inherit awscli2 aws-sam-cli; + inherit aws-sam-cli; } diff --git a/nix/pkgs/awscli2/default.nix b/nix/pkgs/awscli2/default.nix deleted file mode 100644 index 694bd194..00000000 --- a/nix/pkgs/awscli2/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, python3 -, groff -, less -, fetchFromGitHub -}: -let - py = python3.override { - packageOverrides = self: super: { - botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev93"; - src = fetchFromGitHub { - owner = "boto"; - repo = "botocore"; - rev = "2d3d78b759341fe25a3b232bbca29b20c8ec61fd"; - sha256 = "sha256-pTLrsON4QdtULwWNBQ5TREtOS97hg1XQZpgwjfq0nwg="; - }; - }); - prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { - version = "2.0.10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; - }; - }); - }; - }; - -in -with py.pkgs; buildPythonApplication rec { - pname = "awscli2"; - version = "2.1.25"; # N.B: if you change this, change botocore to a matching version too - - src = fetchFromGitHub { - owner = "aws"; - repo = "aws-cli"; - rev = version; - sha256 = "sha256-2H9W1ibcP1vw+1NASJnL2f02G3CyPWovm5AAXHArbkU="; - }; - - postPatch = '' - substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5" - substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0" - substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" - substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0" - substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" - ''; - - # No tests included - doCheck = false; - - propagatedBuildInputs = [ - bcdoc - botocore - colorama - cryptography - distro - docutils - groff - less - prompt_toolkit - pyyaml - rsa - ruamel_yaml - s3transfer - six - wcwidth - ]; - - postInstall = '' - mkdir -p $out/${python3.sitePackages}/awscli/data - ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index - - mkdir -p $out/share/bash-completion/completions - echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/aws - - mkdir -p $out/share/zsh/site-functions - mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions - - rm $out/bin/aws.cmd - ''; - - passthru.python = py; # for aws_shell - - meta = with lib; { - homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; - changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; - description = "Unified tool to manage your AWS services"; - license = licenses.asl20; - maintainers = with maintainers; [ bhipple davegallant ]; - }; -}