awscli2: nixfmt-rfc-style

This commit is contained in:
Kirill Radzikhovskyy
2024-09-21 08:19:51 +10:00
parent bded1f52ca
commit f9c3ec68e1
+74 -60
View File
@@ -1,59 +1,62 @@
{ 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: {
sphinx = prev.sphinx.overridePythonAttrs (prev: {
disabledTests = prev.disabledTests ++ [
"test_check_link_response_only" # fails on hydra https://hydra.nixos.org/build/242624087/nixlog/1
];
});
python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: {
version = "2.8.2";
pyproject = null;
src = prev.src.override {
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
];
});
python-dateutil = prev.python-dateutil.overridePythonAttrs (prev: {
version = "2.8.2";
hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY=";
};
patches = [
# https://github.com/dateutil/dateutil/pull/1285
(fetchpatch {
url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch";
relative = "src";
hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o=";
})
];
postPatch = null;
});
ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: {
src = prev.src.override {
version = "0.17.21";
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
};
});
urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
pyproject = true;
version = "1.26.18";
nativeBuildInputs = with final; [
setuptools
];
src = prev.src.override {
inherit version;
hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
};
});
});
pyproject = null;
src = prev.src.override {
version = "2.8.2";
hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY=";
};
patches = [
# https://github.com/dateutil/dateutil/pull/1285
(fetchpatch {
url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch";
relative = "src";
hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o=";
})
];
postPatch = null;
});
ruamel-yaml = prev.ruamel-yaml.overridePythonAttrs (prev: {
src = prev.src.override {
version = "0.17.21";
hash = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68=";
};
});
urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
pyproject = true;
version = "1.26.18";
nativeBuildInputs = with final; [
setuptools
];
src = prev.src.override {
inherit version;
hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
};
});
}
);
};
in
@@ -123,13 +126,15 @@ py.pkgs.buildPythonApplication rec {
pytestCheckHook
];
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) ''
rm $out/bin/aws.cmd
'';
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) ''
rm $out/bin/aws.cmd
'';
preCheck = ''
export PATH=$PATH:$out/bin
@@ -160,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;
@@ -174,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";
};
}