Loading pkgs/by-name/aw/awscli2/package.nix +78 −70 Original line number Diff line number Diff line { lib , stdenv , python3 , groff , less , fetchFromGitHub , fetchpatch , installShellFiles , nix-update-script , testers , awscli2 { lib, stdenv, python3, groff, less, fetchFromGitHub, fetchpatch, installShellFiles, nix-update-script, testers, awscli2, }: let py = python3 // { pkgs = python3.pkgs.overrideScope (final: prev: { pkgs = python3.pkgs.overrideScope ( final: prev: { sphinx = prev.sphinx.overridePythonAttrs (prev: { disabledTests = prev.disabledTests ++ [ "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1 Loading Loading @@ -53,34 +55,29 @@ let hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; }; }); }); } ); }; in py.pkgs.buildPythonApplication rec { pname = "awscli2"; version = "2.17.42"; # N.B: if you change this, check if overrides are still up-to-date version = "2.17.56"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; hash = "sha256-f6S206MQy0qyHIJTIKSHBKT+P0dVCiUn5pMp2tClSb0="; hash = "sha256-h82g99+3TsMa5yyzt7A1q3m2vO34rJlhmOlXx6jqmUk="; }; patches = [ # Temporary test fix until https://github.com/aws/aws-cli/pull/8838 is merged upstream (fetchpatch { url = "https://github.com/aws/aws-cli/commit/b5f19fe136ab0752cd5fcab21ff0ab59bddbea99.patch"; hash = "sha256-NM+nVlpxGAHVimrlV0m30d4rkFVb11tiH8Y6//2QhMI="; }) ]; patches = [ ]; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \ --replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' Loading Loading @@ -129,11 +126,13 @@ py.pkgs.buildPythonApplication rec { pytestCheckHook ]; postInstall = '' postInstall = '' installShellCompletion --cmd aws \ --bash <(echo "complete -C $out/bin/aws_completer aws") \ --zsh $out/bin/aws_zsh_completer.sh '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm $out/bin/aws.cmd ''; Loading Loading @@ -166,7 +165,10 @@ py.pkgs.buildPythonApplication rec { python = py; # for aws_shell updateScript = nix-update-script { # Excludes 1.x versions from the Github tags list extraArgs = [ "--version-regex" "^(2\.(.*))" ]; extraArgs = [ "--version-regex" "^(2\.(.*))" ]; }; tests.version = testers.testVersion { package = awscli2; Loading @@ -180,7 +182,13 @@ py.pkgs.buildPythonApplication rec { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; mainProgram = "aws"; }; } pkgs/top-level/all-packages.nix +0 −5 Original line number Diff line number Diff line Loading @@ -3170,11 +3170,6 @@ with pkgs; awscli = callPackage ../tools/admin/awscli { }; awscli2 = callPackage ../by-name/aw/awscli2/package.nix { # change when https://github.com/aws/aws-cli/issues/8342 resolved python3 = python311; }; okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { }; awsebcli = callPackage ../tools/virtualization/awsebcli { }; Loading
pkgs/by-name/aw/awscli2/package.nix +78 −70 Original line number Diff line number Diff line { lib , stdenv , python3 , groff , less , fetchFromGitHub , fetchpatch , installShellFiles , nix-update-script , testers , awscli2 { lib, stdenv, python3, groff, less, fetchFromGitHub, fetchpatch, installShellFiles, nix-update-script, testers, awscli2, }: let py = python3 // { pkgs = python3.pkgs.overrideScope (final: prev: { pkgs = python3.pkgs.overrideScope ( final: prev: { sphinx = prev.sphinx.overridePythonAttrs (prev: { disabledTests = prev.disabledTests ++ [ "test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1 Loading Loading @@ -53,34 +55,29 @@ let hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; }; }); }); } ); }; in py.pkgs.buildPythonApplication rec { pname = "awscli2"; version = "2.17.42"; # N.B: if you change this, check if overrides are still up-to-date version = "2.17.56"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; hash = "sha256-f6S206MQy0qyHIJTIKSHBKT+P0dVCiUn5pMp2tClSb0="; hash = "sha256-h82g99+3TsMa5yyzt7A1q3m2vO34rJlhmOlXx6jqmUk="; }; patches = [ # Temporary test fix until https://github.com/aws/aws-cli/pull/8838 is merged upstream (fetchpatch { url = "https://github.com/aws/aws-cli/commit/b5f19fe136ab0752cd5fcab21ff0ab59bddbea99.patch"; hash = "sha256-NM+nVlpxGAHVimrlV0m30d4rkFVb11tiH8Y6//2QhMI="; }) ]; patches = [ ]; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \ --replace-fail 'cryptography>=3.3.2,<40.0.2' 'cryptography>=3.3.2' \ --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \ --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \ --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \ --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' Loading Loading @@ -129,11 +126,13 @@ py.pkgs.buildPythonApplication rec { pytestCheckHook ]; postInstall = '' postInstall = '' installShellCompletion --cmd aws \ --bash <(echo "complete -C $out/bin/aws_completer aws") \ --zsh $out/bin/aws_zsh_completer.sh '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' '' + lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm $out/bin/aws.cmd ''; Loading Loading @@ -166,7 +165,10 @@ py.pkgs.buildPythonApplication rec { python = py; # for aws_shell updateScript = nix-update-script { # Excludes 1.x versions from the Github tags list extraArgs = [ "--version-regex" "^(2\.(.*))" ]; extraArgs = [ "--version-regex" "^(2\.(.*))" ]; }; tests.version = testers.testVersion { package = awscli2; Loading @@ -180,7 +182,13 @@ py.pkgs.buildPythonApplication rec { homepage = "https://aws.amazon.com/cli/"; changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb anthonyroussel ]; mainProgram = "aws"; }; }
pkgs/top-level/all-packages.nix +0 −5 Original line number Diff line number Diff line Loading @@ -3170,11 +3170,6 @@ with pkgs; awscli = callPackage ../tools/admin/awscli { }; awscli2 = callPackage ../by-name/aw/awscli2/package.nix { # change when https://github.com/aws/aws-cli/issues/8342 resolved python3 = python311; }; okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { }; awsebcli = callPackage ../tools/virtualization/awsebcli { };