From 383aaa65d13b9fd6419cfd4c45f8c40c88a9259e Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 22 Feb 2025 00:03:42 -0500 Subject: [PATCH 1/5] python3Packages.plux: 1.11.0 -> 1.12.0 --- pkgs/development/python-modules/plux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 3c726b7d3b36..7f63915d1aee 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "plux"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; # Tests are not available from PyPi @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "localstack"; repo = "plux"; tag = "v${version}"; - hash = "sha256-M4N3Ccuw95OcLsWQVtITv4QShBJKliTh5QIoqji8x9o="; + hash = "sha256-2Sxn/LuiwTzByAAz7VlNLsxEiPIyJWXr86/76Anx+EU="; }; build-system = [ From 5bdd046b805877f24bde2b94f8c59cf7f8135104 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 22 Feb 2025 00:00:35 -0500 Subject: [PATCH 2/5] localstack: promote to top-level attribute This is a CLI --- .../lo/localstack/package.nix} | 37 +++++++------------ .../localstack-client/default.nix | 6 +-- .../python-modules/localstack-ext/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 6 files changed, 20 insertions(+), 34 deletions(-) rename pkgs/{development/python-modules/localstack/default.nix => by-name/lo/localstack/package.nix} (76%) diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/by-name/lo/localstack/package.nix similarity index 76% rename from pkgs/development/python-modules/localstack/default.nix rename to pkgs/by-name/lo/localstack/package.nix index a2f8e39b8531..f334bb2cc9d8 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/by-name/lo/localstack/package.nix @@ -1,29 +1,10 @@ { lib, - buildPythonPackage, + python3, fetchFromGitHub, - apispec, - boto3, - build, - cachetools, - click, - cryptography, - localstack-client, - localstack-ext, - plux, - psutil, - python-dotenv, - pyyaml, - packaging, - requests, - rich, - semver, - setuptools, - setuptools-scm, - tailer, }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "localstack"; version = "4.0.3"; pyproject = true; @@ -35,12 +16,12 @@ buildPythonPackage rec { hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ="; }; - build-system = [ + build-system = with python3.pkgs; [ setuptools setuptools-scm ]; - dependencies = [ + propagatedBuildInputs = with python3.pkgs; [ apispec boto3 build @@ -60,7 +41,9 @@ buildPythonPackage rec { tailer ]; - pythonRelaxDeps = [ "dill" ]; + pythonRelaxDeps = [ + "dill" + ]; pythonImportsCheck = [ "localstack" ]; @@ -76,6 +59,12 @@ buildPythonPackage rec { runHook postCheck ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + meta = with lib; { description = "Fully functional local Cloud stack"; homepage = "https://github.com/localstack/localstack"; diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 638f4328abf4..3c708507bf53 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -5,8 +5,8 @@ boto3, pytestCheckHook, - # downstream dependencies - localstack, + # use for promoted localstack + pkgs, }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; passthru.tests = { - inherit localstack; + inherit (pkgs) localstack; }; meta = with lib; { diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index e7989ddfd1df..91a9c613925a 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -15,8 +15,8 @@ python-dateutil, tabulate, - # Sensitive downstream dependencies - localstack, + # use for testing promoted localstack + pkgs, }: buildPythonPackage rec { @@ -60,7 +60,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - inherit localstack; + inherit (pkgs) localstack; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e289c52ded44..aa0d6127305f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4137,8 +4137,6 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - localstack = with python3Packages; toPythonApplication localstack; - xz = callPackage ../tools/compression/xz { }; lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 95a0398eed80..61e98d425dd6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -354,6 +354,7 @@ mapAliases ({ livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 lmcloud = pylamarzocco; # added 2024-11-26 + localstack = throw "localstack was promoted to a top-level attribute"; # added 2025-02-21 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c30a1d273f9..ac22f7007597 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7736,8 +7736,6 @@ self: super: with self; { localimport = callPackage ../development/python-modules/localimport { }; - localstack = callPackage ../development/python-modules/localstack { }; - localstack-client = callPackage ../development/python-modules/localstack-client { }; localstack-ext = callPackage ../development/python-modules/localstack-ext { }; From 7803c05f0c7ac6ecdf3c075850592ee440b00f37 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 22 Feb 2025 00:15:07 -0500 Subject: [PATCH 3/5] localstack: 4.0.3 -> 4.1.1 https://github.com/localstack/localstack/releases/tag/v4.1.0 https://github.com/localstack/localstack/releases/tag/v4.1.1 --- pkgs/by-name/lo/localstack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix index f334bb2cc9d8..9f166f2c91d5 100644 --- a/pkgs/by-name/lo/localstack/package.nix +++ b/pkgs/by-name/lo/localstack/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "localstack"; - version = "4.0.3"; + version = "4.1.1"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; tag = "v${version}"; - hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ="; + hash = "sha256-hITo6BAsFNGFG5N0b2N9nydGCsG7ged8/3g0sWovNYw="; }; build-system = with python3.pkgs; [ From aa06c67367fc55a9d9faa7430d0b8f303e5a4761 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 22 Feb 2025 00:21:38 -0500 Subject: [PATCH 4/5] python3Packages.localstack-ext: 4.0.3 -> 4.1.1 --- 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 91a9c613925a..78baef323e19 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "4.0.3"; + version = "4.1.1"; pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-vivEdEk32wJln8jfhrAtygO5CEvtsdXI7sxrj0dqIdA="; + hash = "sha256-Fgblk8eL5JnF4yLeH73yGuOeH9anSu1o9H1UxcjTyco="; }; build-system = [ From 814f9ca728ba383676881ea7448fb16afc53b211 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 22 Feb 2025 00:25:46 -0500 Subject: [PATCH 5/5] python3Packages.localstack-client: 1.38 -> 2.7 Switch to pypi so we can at least auto update properly --- .../python-modules/localstack-client/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/localstack-client/default.nix b/pkgs/development/python-modules/localstack-client/default.nix index 3c708507bf53..e74b8daa7015 100644 --- a/pkgs/development/python-modules/localstack-client/default.nix +++ b/pkgs/development/python-modules/localstack-client/default.nix @@ -1,25 +1,23 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, boto3, pytestCheckHook, - # use for promoted localstack + # use for testing promoted localstack pkgs, }: buildPythonPackage rec { pname = "localstack-client"; - version = "1.39"; + version = "2.7"; format = "setuptools"; - src = fetchFromGitHub { - owner = "localstack"; - repo = "localstack-python-client"; - # Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38 - rev = "f1e538ad23700e5b1afe98720404f4801475e470"; - hash = "sha256-MBXTiTzCwkduJPPRN7OKaWy2q9J8xCX/GGu09tyac3A="; + src = fetchPypi { + pname = "localstack_client"; + inherit version; + hash = "sha256-FJkxGZAaS8vvfDLYmbJPSliodaZ2VpPt8QZNZrimhAg="; }; propagatedBuildInputs = [ boto3 ];