Merge pull request #303995 from fabaff/cloud-custodian-refactor

cloud-custodian: 0.8.45.1 -> 0.9.35.0

authored by Franz Pletz and committed by GitHub 447fe499 3c004288

+30 -21
+29 -20
pkgs/tools/networking/cloud-custodian/default.nix
··· 1 - { lib, buildPythonApplication, fetchPypi 2 - , argcomplete 3 - , boto3 4 - , botocore 5 - , certifi 6 - , python-dateutil 7 - , jsonpatch 8 - , jsonschema 9 - , pyyaml 10 - , tabulate 11 - , urllib3 1 + { 2 + lib, 3 + python3, 4 + fetchFromGitHub, 12 5 }: 13 6 14 - buildPythonApplication rec { 7 + python3.pkgs.buildPythonApplication rec { 15 8 pname = "cloud-custodian"; 16 - version = "0.8.45.1"; 9 + version = "0.9.35.0"; 10 + pyproject = true; 17 11 18 - src = fetchPypi { 19 - pname = "c7n"; 20 - inherit version; 21 - sha256 = "0c199gdmpm83xfghrbzp02xliyxiygsnx2fvb35j9qpf37wzzp3z"; 12 + src = fetchFromGitHub { 13 + owner = "cloud-custodian"; 14 + repo = "cloud-custodian"; 15 + rev = "refs/tags/${version}"; 16 + hash = "sha256-iiyYtAtAQKTGrXdIPXGs11QWuPWn+IWmXpjmYO5S6Pg="; 22 17 }; 23 18 24 - propagatedBuildInputs = [ 19 + pythonRelaxDeps = [ 20 + "docutils" 21 + "importlib-metadata" 22 + "referencing" 23 + "urllib3" 24 + ]; 25 + 26 + build-system = with python3.pkgs; [ poetry-core ]; 27 + 28 + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; 29 + 30 + dependencies = with python3.pkgs; [ 25 31 argcomplete 26 32 boto3 27 33 botocore 28 34 certifi 29 - python-dateutil 35 + docutils 36 + importlib-metadata 30 37 jsonpatch 31 38 jsonschema 39 + python-dateutil 32 40 pyyaml 33 41 tabulate 34 42 urllib3 ··· 41 49 42 50 meta = with lib; { 43 51 description = "Rules engine for cloud security, cost optimization, and governance"; 44 - mainProgram = "custodian"; 45 52 homepage = "https://cloudcustodian.io"; 53 + changelog = "https://github.com/cloud-custodian/cloud-custodian/releases/tag/${version}"; 46 54 license = licenses.asl20; 47 55 maintainers = with maintainers; [ bhipple ]; 56 + mainProgram = "custodian"; 48 57 }; 49 58 }
+1 -1
pkgs/top-level/all-packages.nix
··· 3634 3634 3635 3635 claws = callPackage ../tools/misc/claws { }; 3636 3636 3637 - cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; 3637 + cloud-custodian = callPackage ../tools/networking/cloud-custodian { }; 3638 3638 3639 3639 coconut = with python3Packages; toPythonApplication coconut; 3640 3640