Merge pull request #104782 from freezeboy/update-aws-sam-cli

pkgs/development/python-modules/aws-sam-translator/default.nix

@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.31.0";
+  version = "1.32.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a1d73d098161e60966b0d53bb310c98e4f66101688cce3d1697903643782d79";
+    sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4=";
   };
 
   # Tests are not included in the PyPI package
@@ -26,9 +26,9 @@ buildPythonPackage rec {
     six
   ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ];
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/awslabs/serverless-application-model";
     description = "Python library to transform SAM templates into AWS CloudFormation templates";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
   };
 }

pkgs/development/tools/aws-sam-cli/default.nix

@@ -4,75 +4,33 @@
 , enableTelemetry ? false
 }:
 
-let
+python3.pkgs.buildPythonApplication rec {
-  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 {
   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 "boto3~=1.14.23" "boto3~=1.14" \
-      --replace "docker~=4.2.0" "docker~=4.3" \
+      --replace "dateparser~=0.7" "dateparser>=0.7" \
-      --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \
+      --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 "watchdog==0.10.3" "watchdog"
-      --replace "tomlkit==0.5.8" "tomlkit~=0.7.0"
   '';
 
   meta = with lib; {