mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
awstool: remove version math that broke, update to 1.33.11
This commit is contained in:
parent
850652e776
commit
ccfe357519
@ -9,18 +9,16 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
botocoreVersion = python3.pkgs.botocore.version;
|
|
||||||
# awscli.version should be pinned to 2 minor versions less than the botocoreVersion
|
|
||||||
versionMinor = toString (lib.toInt (lib.versions.minor botocoreVersion) - 2);
|
|
||||||
versionPatch = lib.versions.patch botocoreVersion;
|
|
||||||
self = python3.pkgs.buildPythonApplication rec {
|
self = python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "awscli";
|
pname = "awscli";
|
||||||
version = "1.${versionMinor}.${versionPatch}"; # N.B: if you change this, change botocore and boto3 to a matching version too
|
# 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
|
||||||
|
version = "1.33.11";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-96hFvXs3Fcvad+PBEpS9RFMJkcD1qHqfQ+8gtVfEbnc=";
|
hash = "sha256-Q8qtGChOnscOm7m3s7bWwUFmrUwMua9N6uz1Lyc8QIY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
pythonRelaxDeps = [
|
pythonRelaxDeps = [
|
||||||
@ -60,7 +58,7 @@ let
|
|||||||
installCheckPhase = ''
|
installCheckPhase = ''
|
||||||
runHook preInstallCheck
|
runHook preInstallCheck
|
||||||
|
|
||||||
$out/bin/aws --version | grep "${botocoreVersion}"
|
$out/bin/aws --version | grep "${python3.pkgs.botocore.version}"
|
||||||
$out/bin/aws --version | grep "${version}"
|
$out/bin/aws --version | grep "${version}"
|
||||||
|
|
||||||
runHook postInstallCheck
|
runHook postInstallCheck
|
||||||
|
Loading…
Reference in New Issue
Block a user