From 9a6034ab18d3bb0e4b5c0f247491e4598f66623e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Apr 2024 02:35:11 +0000 Subject: [PATCH 1/3] python312Packages.policy-sentry: 0.12.10 -> 0.12.12 --- pkgs/development/python-modules/policy-sentry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 19cfbf29192c..2c6e5a960bc0 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.10"; + version = "0.12.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-Kha5fq5l1yXWjDZq9GFKk3gYRtrEyiCFjbEAdYGPSa8="; + hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50="; }; propagatedBuildInputs = [ From 08de45e972a482a2dc5222b2e76a5e8a0244db9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:46:28 +0200 Subject: [PATCH 2/3] python312Packages.policy-sentry: refactor --- .../python-modules/policy-sentry/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 2c6e5a960bc0..381b2e5f639f 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -8,12 +8,13 @@ , pyyaml , requests , schema +, setuptools }: buildPythonPackage rec { pname = "policy-sentry"; version = "0.12.12"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +25,11 @@ buildPythonPackage rec { hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ beautifulsoup4 click requests @@ -42,10 +47,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating IAM least privilege policies"; - mainProgram = "policy_sentry"; homepage = "https://github.com/salesforce/policy_sentry"; changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; + mainProgram = "policy_sentry"; }; } From 8457a384df3358e83eab5e080eb0e46f70c9585d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 01:47:05 +0200 Subject: [PATCH 3/3] python312Packages.policy-sentry: use nixfmt --- .../python-modules/policy-sentry/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 381b2e5f639f..09e909eaa142 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -1,14 +1,15 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, click -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, pyyaml -, requests -, schema -, setuptools +{ + lib, + beautifulsoup4, + buildPythonPackage, + click, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + pyyaml, + requests, + schema, + setuptools, }: buildPythonPackage rec { @@ -25,9 +26,7 @@ buildPythonPackage rec { hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ beautifulsoup4 @@ -37,13 +36,9 @@ buildPythonPackage rec { schema ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "policy_sentry" - ]; + pythonImportsCheck = [ "policy_sentry" ]; meta = with lib; { description = "Python module for generating IAM least privilege policies";