From 82f1bfba2d41ae260f497af3d96152059cae6ba6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 10:54:00 +0100 Subject: [PATCH 1/7] python311Packages.msgraph-sdk: init at 1.1.0 Microsoft Graph SDK for Python https://github.com/microsoftgraph/msgraph-sdk-python --- .../python-modules/msgraph-sdk/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/msgraph-sdk/default.nix diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix new file mode 100644 index 000000000000..a3ad7b98b356 --- /dev/null +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -0,0 +1,57 @@ +{ lib +, azure-identity +, buildPythonPackage +, fetchFromGitHub +, microsoft-kiota-abstractions +, microsoft-kiota-authentication-azure +, microsoft-kiota-http +, microsoft-kiota-serialization-json +, microsoft-kiota-serialization-text +, msgraph-core +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "msgraph-sdk"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoftgraph"; + repo = "msgraph-sdk-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-fAchReqVhkVhT48UrTnBUQerHmgB7qxpey0xrgxIVDs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + azure-identity + microsoft-kiota-abstractions + microsoft-kiota-authentication-azure + microsoft-kiota-http + microsoft-kiota-serialization-json + microsoft-kiota-serialization-text + msgraph-core + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "msgraph" + ]; + + meta = with lib; { + description = "Microsoft Graph SDK for Python"; + homepage = "https://github.com/microsoftgraph/msgraph-sdk-python"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b0a2b5aaf06..6b47600195ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9554,6 +9554,8 @@ self: super: with self; { msgraph-core = callPackage ../development/python-modules/msgraph-core { }; + msgraph-sdk = callPackage ../development/python-modules/msgraph-sdk { }; + multipart = callPackage ../development/python-modules/multipart { }; netmap = callPackage ../development/python-modules/netmap { }; From 2dd1ea1829772522a529c5ef2f7df68782dcaecd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Feb 2024 10:57:10 +0100 Subject: [PATCH 2/7] prowler: 3.12.1 -> 3.13.0 Changelog: https://github.com/prowler-cloud/prowler/releases/tag/3.13.0 --- pkgs/by-name/pr/prowler/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 702d78b78a79..d45502552432 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "3.12.1"; + version = "3.13.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; rev = "refs/tags/${version}"; - hash = "sha256-QauDqeCa499AcZurGjn2Yv4GH04F/pahAH2ms7gAca4="; + hash = "sha256-19B6b+xR+f7dIu/6eINsxs7UxuV96QdsNncodC8/N3Q="; }; pythonRelaxDeps = [ @@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec { "boto3" "botocore" "google-api-python-client" + "jsonschema" + "pydantic" "slack-sdk" "pydantic" ]; @@ -33,7 +35,10 @@ python3.pkgs.buildPythonApplication rec { alive-progress awsipranges azure-identity + azure-mgmt-applicationinsights azure-mgmt-authorization + azure-mgmt-cosmosdb + azure-mgmt-rdbms azure-mgmt-security azure-mgmt-sql azure-mgmt-storage @@ -46,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { google-api-python-client google-auth-httplib2 jsonschema - msgraph-core + msgraph-sdk msrestazure pydantic_1 schema From d4d00d7caa292b2080770b2f7f775acf097cff05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:05:57 +0200 Subject: [PATCH 3/7] prowler: use nixfmt --- pkgs/by-name/pr/prowler/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index d45502552432..662249049aad 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -1,6 +1,7 @@ -{ lib -, python3 -, fetchFromGitHub +{ + lib, + python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { @@ -60,9 +61,7 @@ python3.pkgs.buildPythonApplication rec { tabulate ]; - pythonImportsCheck = [ - "prowler" - ]; + pythonImportsCheck = [ "prowler" ]; meta = with lib; { description = "Security tool for AWS, Azure and GCP to perform Cloud Security best practices assessments"; From fc9d76911a46dded5c6d1f6f666cf22f03b44a6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:07:21 +0200 Subject: [PATCH 4/7] prowler: refactor --- pkgs/by-name/pr/prowler/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 662249049aad..2c1f8a13aca5 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -28,11 +28,14 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ + poetry-core + ]; + + dependencies = with python3.pkgs; [ alive-progress awsipranges azure-identity From 57442397aab8adf03d8e6ffd4e13d39bb3c8dff3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:08:12 +0200 Subject: [PATCH 5/7] python311Packages.msgraph-sdk: use nixfmt --- .../python-modules/msgraph-sdk/default.nix | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index a3ad7b98b356..90ec95814a0e 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -1,15 +1,16 @@ -{ lib -, azure-identity -, buildPythonPackage -, fetchFromGitHub -, microsoft-kiota-abstractions -, microsoft-kiota-authentication-azure -, microsoft-kiota-http -, microsoft-kiota-serialization-json -, microsoft-kiota-serialization-text -, msgraph-core -, pythonOlder -, setuptools +{ + lib, + azure-identity, + buildPythonPackage, + fetchFromGitHub, + microsoft-kiota-abstractions, + microsoft-kiota-authentication-azure, + microsoft-kiota-http, + microsoft-kiota-serialization-json, + microsoft-kiota-serialization-text, + msgraph-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -26,9 +27,7 @@ buildPythonPackage rec { hash = "sha256-fAchReqVhkVhT48UrTnBUQerHmgB7qxpey0xrgxIVDs="; }; - nativeBuildInputs = [ - setuptools - ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ azure-identity @@ -43,9 +42,7 @@ buildPythonPackage rec { # Module doesn't have tests doCheck = false; - pythonImportsCheck = [ - "msgraph" - ]; + pythonImportsCheck = [ "msgraph" ]; meta = with lib; { description = "Microsoft Graph SDK for Python"; From be705806042e170fe684dfc0483fe88039a9b80e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:09:21 +0200 Subject: [PATCH 6/7] python311Packages.msgraph-sdk:refactor --- pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 90ec95814a0e..51027a2897bf 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-fAchReqVhkVhT48UrTnBUQerHmgB7qxpey0xrgxIVDs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-identity microsoft-kiota-abstractions microsoft-kiota-authentication-azure From 9753f67e5ee087b434a9e64e488639b36bd84af4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:22:01 +0200 Subject: [PATCH 7/7] prowler: relax azure-storage-blob --- pkgs/by-name/pr/prowler/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 2c1f8a13aca5..ab3e0da7bc9b 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -18,6 +18,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "azure-mgmt-security" + "azure-storage-blob" "boto3" "botocore" "google-api-python-client"