Unverified Commit 978facdf authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

localstack: fix build, move to toplevel, 4.0.3 -> 4.1.1 (#384156)

parents eb4f4904 814f9ca7

pkgs/development/python-modules/localstack/default.nix→pkgs/by-name/lo/localstack/package.nix

+15 −26
Original line number Diff line number Diff line 
{

  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";

  version = "4.1.1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "localstack";

    repo = "localstack";

    tag = "v${version}";

    hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ=";

    hash = "sha256-hITo6BAsFNGFG5N0b2N9nydGCsG7ged8/3g0sWovNYw=";

  };



  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";

pkgs/development/python-modules/localstack-client/default.nix

+9 −11
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchFromGitHub,

  fetchPypi,

  boto3,

  pytestCheckHook,



  # downstream dependencies

  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 ];
@@ -39,7 +37,7 @@ buildPythonPackage rec { 
  __darwinAllowLocalNetworking = true;



  passthru.tests = {

    inherit localstack;

    inherit (pkgs) localstack;

  };



  meta = with lib; {

pkgs/development/python-modules/localstack-ext/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -15,19 +15,19 @@ 
  python-dateutil,

  tabulate,



  # Sensitive downstream dependencies

  localstack,

  # use for testing promoted localstack

  pkgs,

}:



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 = [
@@ -60,7 +60,7 @@ buildPythonPackage rec { 
  doCheck = false;



  passthru.tests = {

    inherit localstack;

    inherit (pkgs) localstack;

  };



  meta = {

pkgs/development/python-modules/plux/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -4131,8 +4131,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; };