diff options
author | freezeboy <freezeboy@users.noreply.github.com> | 2020-11-24 17:22:13 +0100 |
---|---|---|
committer | freezeboy <freezeboy@users.noreply.github.com> | 2021-02-12 09:07:28 +0100 |
commit | 96a0d30eb0d475a6f2bfe37e3d0ad5f92635a3c3 (patch) | |
tree | 261d3d998a7a5f1a41e924511ff2801a829b033f /pkgs/development/tools/aws-sam-cli | |
parent | b1611c815869ace0a7f12b1f804ecc254af2bee9 (diff) |
aws-sam-cli: 1.6.2 -> 1.14.0
Diffstat (limited to 'pkgs/development/tools/aws-sam-cli')
-rw-r--r-- | pkgs/development/tools/aws-sam-cli/default.nix | 65 |
1 files changed, 11 insertions, 54 deletions
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 402e12efab0ff..0859ed513230f 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -4,75 +4,33 @@ , enableTelemetry ? false }: -let - py = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j6f4a9rpfh25k1gp7azqhnni4mb4fgy50jammgjgddw1l3w0w92"; - }; - }); - - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-MlgSL0zWcbo9wUE4LdBBLBI9ufExe+2LJucin2NjRFQ="; - }; - }); - - dateparser = super.dateparser.overridePythonAttrs (oldAttrs: rec { - version = "0.7.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-lAgoGDyTe87FMHUyEbcPZzwKmquDHkMnNImzEFON/4Y="; - }; - }); - - cookiecutter = super.cookiecutter.overridePythonAttrs (oldAttrs: rec { - version = "1.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"; - }; - }); - }; - }; - -in - -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.6.2"; + version = "1.14.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0scnymhhiiqrs2j0jaypxgq2wg1qf1w8f55qfay0b3nf51y6mh8y"; + sha256 = "E+xIS0Z3M/ilBswH8XwXWnGb9gbDRuuKKE39qau9fFc="; }; # Tests are not included in the PyPI package doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ aws-lambda-builders aws-sam-translator chevron click cookiecutter dateparser + python-dateutil docker flask - idna jmespath - pathlib2 requests serverlessrepo - six tomlkit + watchdog ]; postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else '' @@ -83,13 +41,12 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ - --replace "boto3~=1.14.0, >=1.14.23" "boto3~=1.14" \ - --replace "docker~=4.2.0" "docker~=4.3" \ - --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "boto3~=1.14.23" "boto3~=1.14" \ + --replace "dateparser~=0.7" "dateparser>=0.7" \ + --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ --replace "requests==2.23.0" "requests~=2.24" \ - --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.7.0" + --replace "watchdog==0.10.3" "watchdog" ''; meta = with lib; { |