diff --git a/flake.nix b/flake.nix index 24b81216..89b79e53 100644 --- a/flake.nix +++ b/flake.nix @@ -107,8 +107,6 @@ in (self.lib.flakes.filterPackagesByPlatform system { - inherit (pkgs) aws-sam-cli; - inherit (pkgs) badhosts-unified; inherit (pkgs) badhosts-fakenews badhosts-gambling badhosts-nsfw badhosts-social diff --git a/nix/overlays/500-aws.nix b/nix/overlays/500-aws.nix deleted file mode 100644 index 978fe2c6..00000000 --- a/nix/overlays/500-aws.nix +++ /dev/null @@ -1,8 +0,0 @@ -final: prev: -let - aws-sam-cli = final.callPackage ../pkgs/aws-sam-cli { }; - -in -{ - inherit aws-sam-cli; -} diff --git a/nix/pkgs/aws-sam-cli/default.nix b/nix/pkgs/aws-sam-cli/default.nix deleted file mode 100644 index 587a110a..00000000 --- a/nix/pkgs/aws-sam-cli/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, enableTelemetry ? false -}: - -let - - py = python3.override { - packageOverrides = self: super: { - aws-lambda-builders = super.aws-lambda-builders.overridePythonAttrs (oldAttrs: rec { - version = "1.3.0"; - src = fetchFromGitHub { - owner = "awslabs"; - repo = "aws-lambda-builders"; - rev = "v${version}"; - sha256 = "sha256-G5i60jr9t2g3beFIp7zDNVTuFqR6eZbZcErjosBlyrE="; - }; - }); - aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { - version = "1.34.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-hXxioD47tKP3B06Gf1LO1jbcBhksghbgBzISLyGiBsI="; - }; - }); - watchdog = super.watchdog.overridePythonAttrs (oldAttrs: rec { - version = "1.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-N2y8KjXAOSsP5/8W+8GzA/2Z1N2ZEatVge6daa3IiYI="; - }; - patches = [ ]; - doCheck = false; - }); - docker = super.docker.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - }; - }; - -in -py.pkgs.buildPythonApplication rec { - pname = "aws-sam-cli"; - version = "1.20.0"; - - src = py.pkgs.fetchPypi { - inherit pname version; - sha256 = "sha256-N4npYbkOUGGTmeDR5Yx0Z8ECkOW5kioRlACYXU/gA2c="; - }; - - # Tests are not included in the PyPI package - doCheck = false; - - propagatedBuildInputs = with py.pkgs; [ - aws-lambda-builders - aws-sam-translator - chevron - click - cookiecutter - dateparser - python-dateutil - docker - flask - jmespath - requests - serverlessrepo - tomlkit - watchdog - ]; - - postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else '' - # Disable telemetry: https://github.com/awslabs/aws-sam-cli/issues/1272 - wrapProgram $out/bin/sam --set SAM_CLI_TELEMETRY 0 - ''; - - # fix over-restrictive version bounds - postPatch = '' - substituteInPlace requirements/base.txt \ - --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 "watchdog==0.10.3" "watchdog" - ''; - - meta = with lib; { - homepage = "https://github.com/awslabs/aws-sam-cli"; - description = "CLI tool for local development and testing of Serverless applications"; - license = licenses.asl20; - maintainers = with maintainers; [ dhess ]; - }; -}