From faecec968f532c3ce63ffaff10481f30e227046b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Apr 2024 01:42:56 +0200 Subject: [PATCH 1/4] Revert "python3Packages.localstack-ext: 3.0.2 -> 3.2.0" This reverts commit 7ca99c8c05cd5cb2b14e3d8060f868bdf3b24e03. --- pkgs/development/python-modules/localstack-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 23423950c23a..1386ce2cb712 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.2.0"; + version = "3.0.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-53pbt7kNaYQRsLb+OI8gLwR3cBE18ZKLZmG4aP1/93E="; + hash = "sha256-KNM/HjSWVwenLqtXbaRP70k7b7YXk//aKGEkBxPp1fA="; }; postPatch = '' From 3db1aaefedc1204f1018590e87677b66eb852add Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Apr 2024 01:43:11 +0200 Subject: [PATCH 2/4] Revert "python3Packages.localstack: 3.0.2 -> 3.2.0" This reverts commit b896da8e70e2cc3098e83d122c6cb2cc11e97a56. --- pkgs/development/python-modules/localstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 13a791482296..39b27be9f93f 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.2.0"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-r0KRPtsLr6Pyn/va93reLdHHKtiOLB1uflAJ2L/uZmU="; + hash = "sha256-HncD/lhYfBrqtXF8F1Gz7JqwrASoHbsXvp1HXM5rldw="; }; postPatch = '' From 175c714affeae522501e471e4aaf664b9ea14d95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Apr 2024 01:43:29 +0200 Subject: [PATCH 3/4] Revert "python3Packages.localstack-ext: 2.3.2 -> 3.0.2" This reverts commit e0c191827fd8dac09ecf71134de8133ee178d60a. --- .../python-modules/localstack-ext/default.nix | 44 +++++-------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 1386ce2cb712..90e743f839e7 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -1,26 +1,14 @@ { lib , buildPythonPackage , fetchPypi - -# build-system -, setuptools -, plux - -# dependencies -, cachetools -, click -, cryptography , dill , dnslib , dnspython -, psutil -, python-dotenv -, pyyaml +, plux +, pyaes +, python-jose , requests -, rich -, semver -, stevedore -, tailer +, tabulate # Sensitive downstream dependencies , localstack @@ -28,12 +16,12 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.0.2"; - pyproject = true; + version = "2.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KNM/HjSWVwenLqtXbaRP70k7b7YXk//aKGEkBxPp1fA="; + hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; }; postPatch = '' @@ -50,27 +38,15 @@ buildPythonPackage rec { --replace "requests>=2.20.0,<2.26" "requests~=2.20" ''; - nativeBuildInputs = [ - plux - setuptools - ]; - propagatedBuildInputs = [ - cachetools - click - cryptography dill dnslib dnspython plux - psutil - python-dotenv - pyyaml - rich + pyaes + python-jose requests - semver - stevedore - tailer + tabulate ]; pythonImportsCheck = [ "localstack_ext" ]; From 92bc73ff0fadb05262fadc94ab1526157ff0d63b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Apr 2024 01:43:44 +0200 Subject: [PATCH 4/4] Revert "python3Packages.localstack: 3.0.0 -> 3.0.2" This reverts commit b9567fc8950606b97a1372e536c4e4ee06811bae. --- .../development/python-modules/localstack/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 39b27be9f93f..6a408c935920 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools , apispec , boto3 , cachetools @@ -21,14 +20,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.0.2"; - pyproject = true; + version = "3.0.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-HncD/lhYfBrqtXF8F1Gz7JqwrASoHbsXvp1HXM5rldw="; + hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU="; }; postPatch = '' @@ -38,10 +37,6 @@ buildPythonPackage rec { --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" ''; - nativeBuildInputs = [ - setuptools - ]; - propagatedBuildInputs = [ apispec boto3