Unverified Commit ce0546f4 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

awscli, awswebcli: cleanup (#501769)

parents 641ff0ca d51f5d64

pkgs/by-name/aw/awscli/package.nix

+10 −10
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ 
  nix-update-script,

  testers,

  awscli,

  versionCheckHook,

}:



let

  self = python3Packages.buildPythonApplication rec {

  self = python3Packages.buildPythonApplication (finalAttrs: {

    pname = "awscli";

    # N.B: if you change this, change botocore and boto3 to a matching version too

    # check e.g. https://github.com/aws/aws-cli/blob/1.33.21/setup.py
@@ -20,7 +21,7 @@ let 
    src = fetchFromGitHub {

      owner = "aws";

      repo = "aws-cli";

      tag = version;

      tag = finalAttrs.version;

      hash = "sha256-yQFK1YjehmACZGMXfMQLc5OiiIGDO08OtwFSpaRyi58=";

    };
@@ -62,32 +63,31 @@ let 
      runHook preInstallCheck



      $out/bin/aws --version | grep "${python3Packages.botocore.version}"

      $out/bin/aws --version | grep "${version}"

      $out/bin/aws --version | grep "${finalAttrs.version}"



      runHook postInstallCheck

    '';



    nativeInstallCheckInputs = [

      versionCheckHook

    ];



    passthru = {

      python = python3Packages.python; # for aws_shell

      updateScript = nix-update-script {

        extraArgs = [ "--version=skip" ];

      };

      tests.version = testers.testVersion {

        package = awscli;

        command = "aws --version";

        inherit version;

      };

    };



    meta = {

      homepage = "https://aws.amazon.com/cli/";

      changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";

      changelog = "https://github.com/aws/aws-cli/blob/${finalAttrs.src.tag}/CHANGELOG.rst";

      description = "Unified tool to manage your AWS services";

      license = lib.licenses.asl20;

      mainProgram = "aws";

      maintainers = with lib.maintainers; [ anthonyroussel ];

    };

  };

  });

in

assert self ? pythonRelaxDeps -> !(lib.elem "botocore" self.pythonRelaxDeps);

self

pkgs/by-name/aw/awsebcli/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
  };

in



python.pkgs.buildPythonApplication rec {

python.pkgs.buildPythonApplication (finalAttrs: {

  pname = "awsebcli";

  version = "3.27";

  pyproject = true;
@@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "aws";

    repo = "aws-elastic-beanstalk-cli";

    tag = version;

    tag = finalAttrs.version;

    hash = "sha256-bqGed3LCOAG5+bSwdaenxM3HtNXI6iRq191XS5Aau8c=";

  };
@@ -107,9 +107,9 @@ python.pkgs.buildPythonApplication rec { 
  meta = {

    description = "Command line interface for Elastic Beanstalk";

    homepage = "https://aws.amazon.com/elasticbeanstalk/";

    changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${version}/CHANGES.rst";

    changelog = "https://github.com/aws/aws-elastic-beanstalk-cli/blob/${finalAttrs.src.tag}/CHANGES.rst";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ kirillrdy ];

    mainProgram = "eb";

  };

}
 
})