diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 61b8d7804f51..a92965db3398 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, std-uritemplate +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + std-uritemplate, }: buildPythonPackage rec { @@ -25,9 +26,7 @@ buildPythonPackage rec { hash = "sha256-n9Erm21slKm+zDblhSHA5Cwxkyrcyx0w09ua3bUc5XI="; }; - build-system = [ - flit-core - ]; + build-system = [ flit-core ]; dependencies = [ opentelemetry-api @@ -41,9 +40,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_abstractions" - ]; + pythonImportsCheck = [ "kiota_abstractions" ]; meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix index 5526fab6ceae..ca0670bc5fa7 100644 --- a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -1,16 +1,17 @@ -{ lib -, aiohttp -, azure-core -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder +{ + lib, + aiohttp, + azure-core, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -27,11 +28,9 @@ buildPythonPackage rec { hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp azure-core microsoft-kiota-abstractions @@ -45,9 +44,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_authentication_azure" - ]; + pythonImportsCheck = [ "kiota_authentication_azure" ]; meta = with lib; { description = "Kiota Azure authentication provider"; diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index a84613b82e3b..259893de0504 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, httpx -, microsoft-kiota-abstractions -, opentelemetry-api -, opentelemetry-sdk -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, urllib3 +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + httpx, + microsoft-kiota-abstractions, + opentelemetry-api, + opentelemetry-sdk, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + urllib3, }: buildPythonPackage rec { @@ -27,11 +28,9 @@ buildPythonPackage rec { hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ httpx microsoft-kiota-abstractions opentelemetry-api @@ -45,9 +44,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "kiota_http" - ]; + pythonImportsCheck = [ "kiota_http" ]; meta = with lib; { description = "HTTP request adapter implementation for Kiota clients for Python"; diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix new file mode 100644 index 000000000000..652e22d767e8 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-form/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pytest-asyncio, + pendulum, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-serialization-form"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-form-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-ecFspbCaSkRoQTTeyZdqGpWSKiQJS6viDgBVNDHPo4g="; + }; + + build-system = [ flit-core ]; + + dependencies = [ + microsoft-kiota-abstractions + pendulum + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "kiota_serialization_form" ]; + + meta = with lib; { + description = "Form serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-form-python"; + changelog = "https://github.com/microsoft/kiota-serialization-form-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix index 21bc6f76feaa..a9bf517e06ba 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, pendulum -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pendulum, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { - pname = "kiota-serialization-json"; + pname = "microsoft-kiota-serialization-json"; version = "1.1.0"; pyproject = true; @@ -24,11 +25,9 @@ buildPythonPackage rec { hash = "sha256-igMqwoKArfQ37pzdjUICgXY795dfg/MX65iwTVe0sLM="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ microsoft-kiota-abstractions pendulum ]; @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_serialization_json" - ]; + pythonImportsCheck = [ "kiota_serialization_json" ]; disabledTests = [ # Test compare an output format diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix new file mode 100644 index 000000000000..543a306d1403 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + microsoft-kiota-serialization-json, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-serialization-multipart"; + version = "0.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-multipart-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-OGX6vX02928F1uCP8bF/q1Z5aDrdj29iQNOITzF2LQI="; + }; + + build-system = [ flit-core ]; + + dependencies = [ microsoft-kiota-abstractions ]; + + nativeCheckInputs = [ + microsoft-kiota-serialization-json + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "kiota_serialization_multipart" ]; + + meta = with lib; { + description = "Multipart serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-multipart-python"; + changelog = "https://github.com/microsoft/kiota-serialization-multipart-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix index 64e00d477875..8c7e2d79ea64 100644 --- a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, flit-core -, microsoft-kiota-abstractions -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, python-dateutil -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + microsoft-kiota-abstractions, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + python-dateutil, + pythonOlder, }: buildPythonPackage rec { - pname = "kiota-serialization-text"; + pname = "microsoft-kiota-serialization-text"; version = "1.0.0"; pyproject = true; @@ -24,11 +25,9 @@ buildPythonPackage rec { hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; }; - nativeBuildInputs = [ - flit-core - ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ microsoft-kiota-abstractions python-dateutil ]; @@ -39,9 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "kiota_serialization_text" - ]; + pythonImportsCheck = [ "kiota_serialization_text" ]; meta = with lib; { description = "Text serialization implementation for Kiota generated clients in Python"; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 51027a2897bf..7dc4e3fd062f 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -6,7 +6,9 @@ microsoft-kiota-abstractions, microsoft-kiota-authentication-azure, microsoft-kiota-http, + microsoft-kiota-serialization-form, microsoft-kiota-serialization-json, + microsoft-kiota-serialization-multipart, microsoft-kiota-serialization-text, msgraph-core, pythonOlder, @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-sdk"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-fAchReqVhkVhT48UrTnBUQerHmgB7qxpey0xrgxIVDs="; + hash = "sha256-UaGdusPGWlF7gTzpCq9WrF/evdDSK5srrkH8/Vz9O8M="; }; build-system = [ setuptools ]; @@ -34,7 +36,9 @@ buildPythonPackage rec { microsoft-kiota-abstractions microsoft-kiota-authentication-azure microsoft-kiota-http + microsoft-kiota-serialization-form microsoft-kiota-serialization-json + microsoft-kiota-serialization-multipart microsoft-kiota-serialization-text msgraph-core ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 616eecfdda75..308efb49248c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7317,8 +7317,12 @@ self: super: with self; { microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { }; + microsoft-kiota-serialization-form = callPackage ../development/python-modules/microsoft-kiota-serialization-form { }; + microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { }; + microsoft-kiota-serialization-multipart = callPackage ../development/python-modules/microsoft-kiota-serialization-multipart { }; + microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { }; midiutil = callPackage ../development/python-modules/midiutil { };