From 31f2a1bdb5848e8579149faa21551080749f8053 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 12:48:05 +0100 Subject: [PATCH 001/125] python310Packages.google-cloud-iam: add changelog to meta --- .../google-cloud-iam/default.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 21ca4ff099fe..2c095ba97441 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -1,28 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, pythonOlder , google-api-core , libcst , mock , proto-plus , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam"; version = "2.9.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/FPuPDJC+AuRNCtKv7pFrpsOlopPFEV/KggDWulRU8A="; + hash = "sha256-/FPuPDJC+AuRNCtKv7pFrpsOlopPFEV/KggDWulRU8A="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.iam_credentials" @@ -32,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Account Credentials API client library"; homepage = "https://github.com/googleapis/python-iam"; + changelog = "https://github.com/googleapis/python-iam/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; From 76784926c3d59742ede374c15f30c869343ae15e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 12:58:51 +0100 Subject: [PATCH 002/125] python310Packages.google-auth: 2.14.0 -> 2.15.0 Changelog: https://github.com/googleapis/google-auth-library-python/blob/v2.15.0/CHANGELOG.md --- .../python-modules/google-auth/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 2a411783fff3..65f2bf1516ce 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -11,6 +11,7 @@ , pyopenssl , pyu2f , requests +, pythonOlder , aioresponses , asynctest , flask @@ -27,11 +28,14 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.14.0"; + version = "2.15.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zySBeFXYdO3i79BxqiISVEX1Vd4Whbc5qXgvz0CMKj0="; + sha256 = "sha256-cvEqbPyWjXVNe9qzacXFwWAyEG5S0yxt/YSE5MAabR8="; }; propagatedBuildInputs = [ @@ -56,6 +60,9 @@ buildPythonPackage rec { reauth = [ pyu2f ]; + requests = [ + requests + ]; }; checkInputs = [ @@ -92,7 +99,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Auth Python Library"; longDescription = '' - This library simplifies using Google’s various server-to-server + This library simplifies using Google's various server-to-server authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; From ef2b8791454427f8dffd99f975d8770838b5b557 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 12:59:17 +0100 Subject: [PATCH 003/125] python310Packages.google-api-core: 2.10.2 -> 2.11.0 Changelog: https://github.com/googleapis/python-api-core/blob/v2.11.0/CHANGELOG.md --- .../google-api-core/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index c92eb490df0e..9dfc1950fd6e 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -4,38 +4,50 @@ , google-auth , googleapis-common-protos , grpcio +, grpcio-gcp , grpcio-status -, protobuf -, proto-plus -, requests , mock +, proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "google-api-core"; - version = "2.10.2"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EMBvdzn+V3gfh1Izdejho6RnS/Y5LNYTGjIiGCuXEyA="; + hash = "sha256-S5u11aOAoL76BXOzAmUbipqJJiwXMON79CPOxRGATCI="; }; propagatedBuildInputs = [ googleapis-common-protos google-auth - grpcio - grpcio-status protobuf proto-plus requests ]; + passthru.optional-dependencies = { + grpc = [ + grpcio + grpcio-status + ]; + grpcgcp = [ + grpcio-gcp + ]; + grpcio-gcp = [ + grpcio-gcp + ]; + }; + checkInputs = [ mock pytest-asyncio From 2afd589a89b4aa2121d694f1e694dae0062aeba5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:00:15 +0100 Subject: [PATCH 004/125] python310Packages.google-cloud-iam: 2.9.0 -> 2.10.0 Changelog: https://github.com/googleapis/python-iam/releases/tag/v2.10.0 --- .../development/python-modules/google-cloud-iam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 2c095ba97441..b415a5015e68 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/FPuPDJC+AuRNCtKv7pFrpsOlopPFEV/KggDWulRU8A="; + hash = "sha256-8q/Am7x5LFN9Uaw37QdUdwL19J1FgxRKjRL0Vrc+1TI="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus - ]; + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From 8e3b49b456cd88ccb73e767b8751b3160a09e22f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:01:36 +0100 Subject: [PATCH 005/125] python310Packages.google-cloud-iam-logging: add changelog to meta --- .../python-modules/google-cloud-iam-logging/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 601d213892e2..5c58ad133a11 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "IAM Service Logging client library"; homepage = "https://github.com/googleapis/python-iam-logging"; + changelog = "https://github.com/googleapis/python-iam-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 9a911023c1a49f98775965b24b3df4d42df0a677 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:05:08 +0100 Subject: [PATCH 006/125] python310Packages.google-cloud-iam-logging: 1.0.6 -> 1.1.0 Changelog: https://github.com/googleapis/python-iam-logging/blob/v1.1.0/CHANGELOG.md --- .../google-cloud-iam-logging/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 5c58ad133a11..4bf47d5a82be 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,21 +13,22 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.6"; + version = "1.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XiuEki6bNKZ8CzfcBBjnDbAh2yEADZohpP991OTf2DI="; + hash = "sha256-q+R8l14wD0PNxP1xKwZcXlbyln3uwoscAsOvletuetg="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From da853fc1fd072b1930238d82a9eac4faaa7fb91c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:07:27 +0100 Subject: [PATCH 007/125] python310Packages.google-cloud-bigquery-logging: add changelog to meta --- .../python-modules/google-cloud-bigquery-logging/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index c46db49774e6..2f48813789f7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bigquery logging client library"; homepage = "https://github.com/googleapis/python-bigquery-logging"; + changelog = "https://github.com/googleapis/python-bigquery-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 849e8145efb9b87571ca3881eea3efcac590d56b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:09:14 +0100 Subject: [PATCH 008/125] python310Packages.google-cloud-bigquery-logging: 1.0.7 -> 1.1.0 Changelog: https://github.com/googleapis/python-bigquery-logging/blob/v1.1.0/CHANGELOG.md --- .../google-cloud-bigquery-logging/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 2f48813789f7..926d14d5267a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,21 +13,22 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.7"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8PP/Vs+sOVDEwIUvWnO6C4+rQvVTtWKMPnREwKEQ0I="; + hash = "sha256-TGK5ghwhVBN0VBMj84Jjt4gpsXQC+HKAr5yP756PbDM="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From b5cf8c9686fd87713483ec64be2bc0947fa1e196 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:11:38 +0100 Subject: [PATCH 009/125] python310Packages.google-cloud-appengine-logging: add changelog to meta --- .../python-modules/google-cloud-appengine-logging/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 4dedba76ff44..a52fbbaa595d 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Appengine logging client library"; homepage = "https://github.com/googleapis/python-appengine-logging"; + changelog = "https://github.com/googleapis/python-appengine-logging/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 22bc63acd5fd29822ca60dcc168fddecdfd3ed3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:12:51 +0100 Subject: [PATCH 010/125] python310Packages.google-cloud-appengine-logging: 1.1.6 -> 1.2.0 Changelog: https://github.com/googleapis/python-appengine-logging/blob/v1.2.0/CHANGELOG.md --- .../google-cloud-appengine-logging/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index a52fbbaa595d..8b75007f5b17 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -5,6 +5,7 @@ , grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,21 +13,22 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.6"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-N0d/8lqqLT4IXbg0QpxchtJ4PmBOvXc4yGkvNhvHyJc="; + hash = "sha256-pvao522dfnRx6JJe4osRgU+q1LpBvdOTP4W9UVVZNiY="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From 374cf3fabfa734699432d6cf2cc97d30c5a598ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:19:47 +0100 Subject: [PATCH 011/125] python310Packages.cirq-google: update input --- pkgs/development/python-modules/cirq-google/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index ebd420244e4b..eeba8feebe7e 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { cirq-core google-api-core protobuf - ]; + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ freezegun From e1f5ee21381dec50f082b9860d2a209b4f53cb25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:22:48 +0100 Subject: [PATCH 012/125] python310Packages.google-cloud-bigquery-datatransfer: add changelog to meta --- .../google-cloud-bigquery-datatransfer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ebb6d95eb1f3..3fdd9c88b1bc 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Data Transfer API client library"; homepage = "https://github.com/googleapis/python-bigquery-datatransfer"; + changelog = "https://github.com/googleapis/python-bigquery-datatransfer/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 3e2ee86eeeb58fe8111e751efa83d77f1a6adde7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:24:53 +0100 Subject: [PATCH 013/125] python310Packages.google-cloud-bigquery-datatransfer: 3.7.3 -> 3.8.0 Changelog: https://github.com/googleapis/python-bigquery-datatransfer/blob/v3.8.0/CHANGELOG.md --- .../default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 3fdd9c88b1bc..3643cf69b767 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -3,37 +3,39 @@ , fetchPypi , google-api-core , libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pytz , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder +, pytz }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.7.3"; + version = "3.8.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oPgbgaq5RQM4C2qmf36i+qXDQA9sV16abCleNkdGYC0="; + hash = "sha256-TR41fn/e4185RW8zkd3SY1E/jNQZuUYJr1n+TwNPHT4="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus + protobuf pytz - ]; + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ From e8f8113ee86452a733051fa38d16bbb79839e262 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 13:26:37 +0100 Subject: [PATCH 014/125] python310Packages.google-cloud-access-context-manager: adjust inputs --- .../google-cloud-access-context-manager/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 55da4e874704..b105e9cfe16d 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -3,6 +3,7 @@ , fetchPypi , google-api-core , pythonOlder +, protobuf }: buildPythonPackage rec { @@ -19,7 +20,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-api-core - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; # No tests in repo doCheck = false; From a2c497b0e8ef3b406178020b02ccbc8d05f5726b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:29:01 +0100 Subject: [PATCH 015/125] python310Packages.google-cloud-bigquery-storage: add changelog to meta --- .../google-cloud-bigquery-storage/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 766a793082cb..f3be87564be7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -5,15 +5,19 @@ , google-auth , google-cloud-bigquery , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; version = "2.16.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; + hash = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; }; propagatedBuildInputs = [ @@ -26,7 +30,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # dependency loop with google-cloud-bigquery + # Dependency loop with google-cloud-bigquery doCheck = false; preCheck = '' @@ -42,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "BigQuery Storage API API client library"; homepage = "https://github.com/googleapis/python-bigquery-storage"; + changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From fe003a9af24dc2f1ed16ced397814b277973deaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:31:40 +0100 Subject: [PATCH 016/125] python310Packages.google-cloud-bigquery-storage: 2.16.2 -> 2.17.0 Changelog: https://github.com/googleapis/python-bigquery-storage/blob/v2.17.0/CHANGELOG.md --- .../google-cloud-bigquery-storage/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index f3be87564be7..650bb81b4b7b 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -4,25 +4,27 @@ , google-api-core , google-auth , google-cloud-bigquery +, protobuf , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.16.2"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; + hash = "sha256-AsEcoAmOg+J/g8P5o51PzO9R5z0Nce9zQ/EiIYhmaFw="; }; propagatedBuildInputs = [ google-api-core - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-auth From e077e20d10679bb77ed7fe4debed79f26c72d253 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:38:13 +0100 Subject: [PATCH 017/125] pythpn310Packages.google-cloud-dataproc: add changelog to meta --- .../development/python-modules/google-cloud-dataproc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 7e75978a3510..8fac7b052acb 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Dataproc API client library"; homepage = "https://github.com/googleapis/python-dataproc"; + changelog = "https://github.com/googleapis/python-dataproc/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From f77686325fb7c9f98af121ba9cc6fe835be8ae3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:39:49 +0100 Subject: [PATCH 018/125] pythpn310Packages.google-cloud-dataproc: adjust inputs --- .../python-modules/google-cloud-dataproc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 8fac7b052acb..7d11b2b3c1c4 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -5,6 +5,7 @@ , mock , libcst , proto-plus +, protobuf , pytestCheckHook , pytest-asyncio , pythonOlder @@ -26,7 +27,8 @@ buildPythonPackage rec { google-api-core libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock @@ -35,7 +37,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_clusters" ]; From 96167f031b185bf864931b853080f925f3262c2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:41:19 +0100 Subject: [PATCH 019/125] pythpn310Packages.google-cloud-iot: add changelog to meta --- pkgs/development/python-modules/google-cloud-iot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index bd902197416a..0cff32907048 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud IoT API API client library"; homepage = "https://github.com/googleapis/python-iot"; + changelog = "https://github.com/googleapis/python-iot/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 795c9fb0e218fac36ce0347715149458a1366aab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:43:29 +0100 Subject: [PATCH 020/125] python310Packages.google-cloud-iot: 2.6.4 -> 2.7.0 Changelog: https://github.com/googleapis/python-iot/blob/v2.7.0/CHANGELOG.md --- .../google-cloud-iot/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 0cff32907048..4cbfcbe42423 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-api-core +, grpc-google-iam-v1 , libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pythonOlder , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.6.4"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d3RRVqgetOS3sAT6UkV5DB/NZMjeZd5tBtd9ME8Wvs4="; + hash = "sha256-vV5emuGcFwUctnPNRW1NSFej599Lc6rFSKAlaaCatZw="; }; propagatedBuildInputs = [ - grpc-google-iam-v1 google-api-core + grpc-google-iam-v1 libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ From ec7cdd6c4cea64c8c4c093c48657b11a152d0b8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:45:01 +0100 Subject: [PATCH 021/125] python310Packages.google-cloud-container: add changelog to meta --- .../python-modules/google-cloud-container/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 260079e58179..1c2d9872c786 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_clusters" ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Container Engine API client library"; homepage = "https://github.com/googleapis/python-container"; + changelog = "https://github.com/googleapis/python-container/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 0f35ebf09443983ca2d5e457c382beb0568f358e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:46:54 +0100 Subject: [PATCH 022/125] python310Packages.google-cloud-container: 2.13.0 -> 2.14.0 Changelog: https://github.com/googleapis/python-container/blob/v2.14.0/CHANGELOG.md --- .../google-cloud-container/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 1c2d9872c786..eab497f2d7b4 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -2,38 +2,38 @@ , buildPythonPackage , fetchPypi , google-api-core -, grpc-google-iam-v1 , libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.13.0"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rq4DuCbXX4DSIr01AFYo0O4+wQv4B5yzrrX9a2ecAFI="; + hash = "sha256-r/AmdcXIChEqp3AvO2xU2lsM3pqmn/Tmv8/cQJ+kuCE="; }; propagatedBuildInputs = [ google-api-core - grpc-google-iam-v1 libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ From c0f32aa42ebef5c2c82e80dfb92a471936fea8e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:48:19 +0100 Subject: [PATCH 023/125] pythpn310Packages.google-cloud-datacatalog: add changelog to meta --- .../python-modules/google-cloud-datacatalog/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 297847f6f3ac..c0ae3184e129 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Data Catalog API API client library"; homepage = "https://github.com/googleapis/python-datacatalog"; + changelog = "https://github.com/googleapis/python-datacatalog/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From e159d8c9f04f2671a491eb84c39b0244fd6d1f8d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:50:00 +0100 Subject: [PATCH 024/125] python310Packages.google-cloud-datacatalog: 3.9.3 -> 3.10.0 Changelog: https://github.com/googleapis/python-datacatalog/blob/v3.10.0/CHANGELOG.md --- .../google-cloud-datacatalog/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index c0ae3184e129..a21a09458b55 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage , fetchPypi -, libcst , google-api-core , grpc-google-iam-v1 +, libcst +, mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook -, mock , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.9.3"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JgGs4lqOruHohIy6GaUGSHr0vd+lFsI5u4PVZwt7tdo="; + hash = "sha256-5j8daEVqDEQKHU/XbZ9U6qp0Aaye0KUzJMyj9fiJtRs="; }; propagatedBuildInputs = [ - libcst google-api-core grpc-google-iam-v1 + libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ + mock pytest-asyncio pytestCheckHook - mock ]; pythonImportsCheck = [ From defc63589b924d3d6caa9be70b0e33dbdbd5baf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:51:33 +0100 Subject: [PATCH 025/125] python310Packages.google-cloud-compute: add changelog to meta --- .../python-modules/google-cloud-compute/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index f51cac5d8a5c..f732e9ddaab2 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -13,11 +13,13 @@ buildPythonPackage rec { pname = "google-cloud-compute"; version = "1.5.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; + hash = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; }; propagatedBuildInputs = [ @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "API Client library for Google Cloud Compute"; homepage = "https://github.com/googleapis/python-compute"; + changelog = "https://github.com/googleapis/python-compute/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ jpetrucciani ]; }; From d8c2d51b1c4b3339f809c92cab5d874cd44f664f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 14:54:43 +0100 Subject: [PATCH 026/125] python310Packages.google-cloud-compute: 1.5.2 -> 1.8.0 Changelog: https://github.com/googleapis/python-compute/blob/v1.8.0/CHANGELOG.md --- .../python-modules/google-cloud-compute/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index f732e9ddaab2..e1041f2811c0 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.5.2"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-D0pIR1vQEt/7aIxMo0uDlxvt+fwS2DxCurU/lxMHAjo="; + hash = "sha256-pnhXkYSXph7aIZJoI3tXTNIUkH44S22QDIGXUl9ceFU="; }; propagatedBuildInputs = [ google-api-core proto-plus protobuf - ]; + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From a7cf0bbfa665b09a76db1022b9ce9828e6118764 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:02:12 +0100 Subject: [PATCH 027/125] python310Packages.google-cloud-core: add changelog to meta --- .../google-cloud-core/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bc72ce501035..d2dac98082f1 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -4,31 +4,43 @@ , pytestCheckHook , google-api-core , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-core"; version = "2.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; }; - propagatedBuildInputs = [ google-api-core ]; + propagatedBuildInputs = [ + google-api-core + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - pythonImportsCheck = [ "google.cloud" ]; + pythonImportsCheck = [ + "google.cloud" + ]; meta = with lib; { description = "API Client library for Google Cloud: Core Helpers"; homepage = "https://github.com/googleapis/python-cloud-core"; + changelog = "https://github.com/googleapis/python-cloud-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 555624c9bf2afefc21f8b8bab1d66d668552db23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:06:14 +0100 Subject: [PATCH 028/125] python310Packages.google-cloud-core: adjust inputs --- .../python-modules/google-cloud-core/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index d2dac98082f1..910528bbcaf0 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core +, google-auth +, grpcio , mock +, pytestCheckHook , pythonOlder }: @@ -16,17 +18,24 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; + hash = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; }; propagatedBuildInputs = [ + google-auth google-api-core ]; + passthru.optional-dependencies = { + grpc = [ + grpcio + ]; + }; + checkInputs = [ mock pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' From a4f5f7c217ec17b0e05463ff08756e63dfd2fc0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:08:13 +0100 Subject: [PATCH 029/125] python310Packages.google-cloud-bigtable: adjust inputs --- .../google-cloud-bigtable/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 7e8f98ce51eb..ecf9162ce8e7 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -3,10 +3,12 @@ , fetchPypi , google-api-core , google-cloud-core +, grpcio , grpc-google-iam-v1 , libcst , mock , proto-plus +, protobuf , pytestCheckHook , pythonOlder }: @@ -27,11 +29,18 @@ buildPythonPackage rec { google-api-core google-cloud-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; checkInputs = [ + grpcio mock pytestCheckHook ]; From 150e09e2134742584ba275340c2d9b2bf50ede94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:10:19 +0100 Subject: [PATCH 030/125] python310Packages.google-cloud-asset: add changelog to meta --- pkgs/development/python-modules/google-cloud-asset/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 68fe9c08a740..6cd7b8c6f502 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for Google Cloud Asset API"; homepage = "https://github.com/googleapis/python-asset"; + changelog = "https://github.com/googleapis/python-asset/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From d909652126ce5600c1b3ad2ed7a702247e45399b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:11:51 +0100 Subject: [PATCH 031/125] python310Packages.google-cloud-asset: adjust inputs --- .../python-modules/google-cloud-asset/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 6cd7b8c6f502..ec5664ae905a 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -8,6 +8,7 @@ , google-cloud-os-config , google-cloud-testutils , libcst +, protobuf , proto-plus , pytest-asyncio , pytestCheckHook @@ -35,7 +36,14 @@ buildPythonPackage rec { google-cloud-os-config libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; checkInputs = [ google-cloud-testutils From 75cbc843f365cdc7a4d35324c0fa620276d3343e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:14:27 +0100 Subject: [PATCH 032/125] python310Packages.google-cloud-audit-log: add changelog to meta --- .../google-cloud-audit-log/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index e1effd0ac2a2..2ac9d4eec216 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -1,12 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: +{ lib +, buildPythonPackage +, fetchPypi +, googleapis-common-protos +, protobuf +}: buildPythonPackage rec { pname = "google-cloud-audit-log"; version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qr5VQ2ceT4qcekwOPqmoe6K6K5b5/61vqgIgmQDh8wg="; + hash = "sha256-qr5VQ2ceT4qcekwOPqmoe6K6K5b5/61vqgIgmQDh8wg="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; @@ -14,11 +22,14 @@ buildPythonPackage rec { # tests are a bit wonky to setup and are not very deep either doCheck = false; - pythonImportsCheck = [ "google.cloud.audit" ]; + pythonImportsCheck = [ + "google.cloud.audit" + ]; meta = with lib; { description = "Google Cloud Audit Protos"; homepage = "https://github.com/googleapis/python-audit-log"; + changelog = "https://github.com/googleapis/python-audit-log/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From e566d9e683b13b4d4d83399922bf2571a1961a7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:16:23 +0100 Subject: [PATCH 033/125] python310Packages.google-cloud-automl: add changelog to meta --- pkgs/development/python-modules/google-cloud-automl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 87ac3fe68f1a..d46b7aee48dc 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud AutoML API client library"; homepage = "https://github.com/googleapis/python-automl"; + changelog = "https://github.com/googleapis/python-automl/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 561aad508e3012a8abddaec5e35aca86b34adfb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:19:27 +0100 Subject: [PATCH 034/125] python310Packages.google-cloud-storage: add changelog to meta --- .../google-cloud-automl/default.nix | 18 ++++++++++++++++-- .../google-cloud-storage/default.nix | 7 +++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index d46b7aee48dc..b9d26e922a77 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -11,6 +11,8 @@ , pytest-asyncio , mock , pythonOlder +, pandas +, google-cloud-storage }: buildPythonPackage rec { @@ -27,9 +29,21 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + pandas = [ + pandas + ]; + storage = [ + google-cloud-storage + ]; + }; checkInputs = [ google-cloud-storage diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 84f489a220b6..e8a2c01b0766 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # disable tests which require credentials and network access + # Disable tests which require credentials and network access disabledTests = [ "create" "download" @@ -69,11 +69,14 @@ buildPythonPackage rec { rm tests/conformance/test_conformance.py ''; - pythonImportsCheck = [ "google.cloud.storage" ]; + pythonImportsCheck = [ + "google.cloud.storage" + ]; meta = with lib; { description = "Google Cloud Storage API client library"; homepage = "https://github.com/googleapis/python-storage"; + changelog = "https://github.com/googleapis/python-storage/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 3ef0bf53425bbafbc658ed9d1010e7ce9ef9513a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:23:26 +0100 Subject: [PATCH 035/125] python310Packages.google-cloud-kms: add changelog to meta --- .../python-modules/google-cloud-kms/default.nix | 7 ++++++- .../google-cloud-storage/default.nix | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 0173f38c184c..8029e84a3dd0 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -8,15 +8,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-kms"; version = "2.12.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0="; + hash = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; @@ -34,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; homepage = "https://github.com/googleapis/python-kms"; + changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index e8a2c01b0766..547a1e4c221a 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -1,35 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-auth -, google-cloud-iam , google-cloud-core +, google-cloud-iam , google-cloud-kms , google-cloud-testutils , google-resumable-media , mock +, protobuf +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.5.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OC80uR3iIS48LntA7AedJ+4uPbuumbdbG82MYwY84jU="; + hash = "sha256-GsLVjS1pPLE0HrxIZZo1J753jZ4tiYlpeidGAlko/xc="; }; propagatedBuildInputs = [ google-auth google-cloud-core google-resumable-media + requests ]; + passthru.optional-dependencies = { + protobuf = [ + protobuf + ]; + }; + checkInputs = [ google-cloud-iam google-cloud-kms From ba46bd0b6254ba2db7051e3ffe95369bb608751f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:25:28 +0100 Subject: [PATCH 036/125] python310Packages.google-cloud-kms: 2.12.3 -> 2.13.0 Changelog: https://github.com/googleapis/python-kms/blob/v2.13.0/CHANGELOG.md --- .../google-cloud-kms/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 8029e84a3dd0..0f99cf3433ca 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -1,34 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, grpc-google-iam-v1 , google-api-core -, libcst +, grpc-google-iam-v1 , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.12.3"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ooWxYH4B8HY9ybWj0GQqUnfiFXzLCqyXGGZsocV9Od0="; + hash = "sha256-0nOQnibi1T0JW9NQaKSrNCnfB5EgsnNYMVCEiUsPRdU="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; # Disable tests that need credentials - disabledTests = [ "test_list_global_key_rings" ]; + disabledTests = [ + "test_list_global_key_rings" + ]; pythonImportsCheck = [ "google.cloud.kms" From 6a7e45bcee1453effee2a035e94db18b547ff0ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:27:15 +0100 Subject: [PATCH 037/125] python310Packages.google-cloud-testutils: add changelog to meta --- .../google-cloud-testutils/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index c2bd3f0a1466..a4ef2bfc9c83 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, click, google-auth, packaging, six }: +{ lib +, buildPythonPackage +, fetchPypi +, click +, google-auth +, packaging +, six +}: buildPythonPackage rec { pname = "google-cloud-testutils"; @@ -14,11 +21,14 @@ buildPythonPackage rec { # does not contain tests doCheck = false; - pythonImportsCheck = [ "test_utils" ]; + pythonImportsCheck = [ + "test_utils" + ]; meta = with lib; { description = "System test utilities for google-cloud-python"; homepage = "https://github.com/googleapis/python-test-utils"; + changelog ="https://github.com/googleapis/python-test-utils/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 5b9881da7b584af8f03aa3d822300b09cdf94185 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:28:57 +0100 Subject: [PATCH 038/125] python310Packages.google-cloud-testutils: adjust inputs --- .../google-cloud-testutils/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index a4ef2bfc9c83..10a2826c5daa 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -1,22 +1,29 @@ { lib , buildPythonPackage -, fetchPypi , click +, fetchPypi , google-auth , packaging -, six +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-testutils"; version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; }; - propagatedBuildInputs = [ click google-auth packaging six ]; + propagatedBuildInputs = [ + click + google-auth + packaging + ]; # does not contain tests doCheck = false; From 20c6cf51d67ca86ba045cdad9c258da85b16fcbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:30:50 +0100 Subject: [PATCH 039/125] python310Packages.google-resumable-media: add changelog to meta --- .../python-modules/google-resumable-media/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 0820ac217f19..87bc0c3406af 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; + hash = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; + changelog = "https://github.com/googleapis/google-resumable-media-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 72d9e7b7e8da292ae3d4f173dc6016bede9e5928 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:34:29 +0100 Subject: [PATCH 040/125] python310Packages.google-resumable-media: add optional-dependencies --- .../google-resumable-media/default.nix | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 87bc0c3406af..b5e4de424b0c 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -1,27 +1,49 @@ { lib +, aiohttp , buildPythonPackage , fetchPypi , google-auth , google-cloud-testutils , google-crc32c , mock -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "google-resumable-media"; version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-jVUYUC+SuezISsRneb1PCWlOyzujij58pzeobRXLyh8="; }; - propagatedBuildInputs = [ google-auth google-crc32c requests ]; + propagatedBuildInputs = [ + google-auth + google-crc32c + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + passthru.optional-dependencies = { + requests = [ + requests + ]; + aiohttp = [ + aiohttp + ]; + }; + + checkInputs = [ + google-cloud-testutils + mock + pytest-asyncio + pytestCheckHook + ] ++ passthru.optional-dependencies.requests; preCheck = '' # prevent shadowing imports From 4ce172cc2d7cec3871df1c4d27e1938d26e08b40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:43:36 +0100 Subject: [PATCH 041/125] python310Packages.google-cloud-storage: 2.5.0 -> 2.7.0 Changelog: https://github.com/googleapis/python-storage/blob/v2.7.0/CHANGELOG.md --- .../development/python-modules/google-cloud-storage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 547a1e4c221a..541997fb72f0 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -60,6 +60,7 @@ buildPythonPackage rec { "test_list_buckets" "test_open" "test_anonymous_client_access_to_public_bucket" + "test_ctor_w_custom_endpoint_use_auth" ]; disabledTestPaths = [ @@ -68,6 +69,7 @@ buildPythonPackage rec { "tests/system/test_bucket.py" "tests/system/test_fileio.py" "tests/system/test_kms_integration.py" + "tests/unit/test_transfer_manager.py" ]; preCheck = '' From f389fa2f1000cfa27596757bca563985e6063b01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:45:43 +0100 Subject: [PATCH 042/125] python310Packages.google-cloud-automl: adjust inputs --- .../python-modules/google-cloud-automl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index b9d26e922a77..c9f5c994aae4 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -1,18 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, libcst , google-api-core , google-cloud-storage , google-cloud-testutils +, libcst +, mock , pandas , proto-plus +, protobuf , pytest-asyncio -, mock +, pytestCheckHook , pythonOlder -, pandas -, google-cloud-storage }: buildPythonPackage rec { From 6d9f9951b57912760a61645ce88eb2349d655c26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:48:11 +0100 Subject: [PATCH 043/125] python310Packages.google-cloud-dns: add changelog to meta --- pkgs/development/python-modules/google-cloud-dns/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index 00bedca7c4ca..b289c1682930 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -5,11 +5,15 @@ , google-cloud-core , pytestCheckHook , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dns"; version = "0.34.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -35,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud DNS API client library"; homepage = "https://github.com/googleapis/python-dns"; + changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 20b5b922a73066e3e4852b79213197493ab8d713 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:49:34 +0100 Subject: [PATCH 044/125] python310Packages.google-cloud-dns: align formatting --- .../google-cloud-dns/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index b289c1682930..f95995aec56b 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -3,8 +3,8 @@ , fetchPypi , google-api-core , google-cloud-core -, pytestCheckHook , mock +, pytestCheckHook , pythonOlder }: @@ -17,12 +17,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; + hash = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; preCheck = '' # don#t shadow python imports @@ -34,7 +40,9 @@ buildPythonPackage rec { "test_quota" ]; - pythonImportsCheck = [ "google.cloud.dns" ]; + pythonImportsCheck = [ + "google.cloud.dns" + ]; meta = with lib; { description = "Google Cloud DNS API client library"; From 5461f904642410f1de0b066d6655a6df75ad6408 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:51:31 +0100 Subject: [PATCH 045/125] python310Packages.google-cloud-websecurityscanner: add changelog to meta --- .../python-modules/google-cloud-websecurityscanner/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index d35944777fbf..6a7458048ec4 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Web Security Scanner API client library"; homepage = "https://github.com/googleapis/python-websecurityscanner"; + changelog = "https://github.com/googleapis/python-websecurityscanner/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 0ed158076457e07f2adb4be83fcb0488936e566d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:53:22 +0100 Subject: [PATCH 046/125] python310Packages.google-cloud-websecurityscanner: 1.9.2 -> 1.10.0 Changelog: https://github.com/googleapis/python-websecurityscanner/blob/v1.10.0/CHANGELOG.md --- .../google-cloud-websecurityscanner/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 6a7458048ec4..024a637ce8c1 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core -, libcst , mock -, protobuf , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.2"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fUnoV5I9kMwC9zUdsHit6MbIYFV+3E+GT76vwEmzNNs="; + hash = "sha256-93ijizxgVFxXzj8IzxrgzzXTQKl7UH3egvL41HVk5is="; }; propagatedBuildInputs = [ google-api-core - libcst - protobuf proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From 9311390801a1eb4aeecafec05c0b0413f703c233 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:54:58 +0100 Subject: [PATCH 047/125] python310Packages.google-cloud-vision: add changelog to meta --- pkgs/development/python-modules/google-cloud-vision/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index b29dd1cff410..eeb44a686aa6 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Vision API API client library"; homepage = "https://github.com/googleapis/python-vision"; + changelog = "https://github.com/googleapis/python-vision/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 778568629327c39fb86a15e585b320ca91bc9700 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:56:37 +0100 Subject: [PATCH 048/125] python310Packages.google-cloud-vision: 3.1.4 -> 3.2.0 Changelog: https://github.com/googleapis/python-vision/blob/v3.2.0/CHANGELOG.md --- .../python-modules/google-cloud-vision/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index eeb44a686aa6..86a83155f561 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -2,31 +2,31 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.1.4"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1nqU9Sr+tWPK3l5r7UiFD0wA3+UmYcHFT4ta2bdRL+U="; + hash = "sha256-SZQxkx57cY+8q4Mg880jT8TlYcfwLz4KEpHiyOb2Ujc="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From 5ac82eb2a55977559a34ea84600e3516ae277b28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:57:54 +0100 Subject: [PATCH 049/125] python310Packages.google-cloud-videointelligence: add changelog to meta --- .../python-modules/google-cloud-videointelligence/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 0c0d579f7daa..304984a2129b 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Video Intelligence API client library"; homepage = "https://github.com/googleapis/python-videointelligence"; + changelog = "https://github.com/googleapis/python-videointelligence/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From bfe260a7993df005d1843520d8f9c9439135ba55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 15:59:24 +0100 Subject: [PATCH 050/125] python310Packages.google-cloud-videointelligence: 2.8.3 -> 2.9.0 Changelog: https://github.com/googleapis/python-videointelligence/blob/v2.9.0/CHANGELOG.md --- .../google-cloud-videointelligence/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 304984a2129b..51115b4f006d 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -1,31 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, mock , google-api-core , google-cloud-testutils +, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.8.3"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pB7exeGYpFT4nf3YuIhoI+bqG6YYEP6oWs0tohkOIbw="; + hash = "sha256-gd0cJX6XHwQguNJ7jFDUVwQg9eNk0ZUL4VH5L+3K+Lw="; }; propagatedBuildInputs = [ google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-cloud-testutils From 15db93510b524999fd9c7ce7b1733e6372499621 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:00:22 +0100 Subject: [PATCH 051/125] python310Packages.google-cloud-translate: add changelog to meta --- .../python-modules/google-cloud-translate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 295eb13a240e..d12ef7a34ddb 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Translation API client library"; homepage = "https://github.com/googleapis/python-translate"; + changelog = "https://github.com/googleapis/python-translate/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From cf2c480620b1e343e7dd1420657b521261ddda34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:01:54 +0100 Subject: [PATCH 052/125] python310Packages.google-cloud-translate: 3.8.4 -> 3.9.0 Changelog: https://github.com/googleapis/python-translate/blob/v3.9.0/CHANGELOG.md --- .../google-cloud-translate/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index d12ef7a34ddb..7041f9bf4365 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -1,35 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core , google-cloud-core , google-cloud-testutils -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.4"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cptSFyAByZRZ7Dr93skVPeCvUoh0/PMACp3dmOEQfuc="; + hash = "sha256-XPfN+IN5gc5KQEXPeaYF5gIlHPxmDoe90RKFqNG6eF8="; }; propagatedBuildInputs = [ google-api-core google-cloud-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-cloud-testutils From 50bdd1283b5b509e8354d34848131339b35e653e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:11:13 +0100 Subject: [PATCH 053/125] python310Packages.google-cloud-trace: add changelog to meta --- pkgs/development/python-modules/google-cloud-trace/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 0bfe7189c860..86f84564a64f 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Trace API client library"; homepage = "https://github.com/googleapis/python-trace"; + changelog = "https://github.com/googleapis/python-trace/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 2d2d772b138ff6c6ecd71360e26d9f72e2b1b7e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:13:03 +0100 Subject: [PATCH 054/125] python310Packages.google-cloud-trace: 1.7.3 -> 1.8.0 Changelog: https://github.com/googleapis/python-trace/blob/v1.8.0/CHANGELOG.md --- .../python-modules/google-cloud-trace/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 86f84564a64f..4cc58aa67060 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -2,32 +2,32 @@ , buildPythonPackage , fetchPypi , google-api-core -, google-cloud-core , google-cloud-testutils , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.7.3"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HFntFmPn3FPhCrB+nnJlBD9zqG2jDsP2naEl2IxhRqE="; + hash = "sha256-dKywvDNcvDOULHREKcHWIBVVBBzrttICX+VgcborJVI="; }; propagatedBuildInputs = [ google-api-core - google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-cloud-testutils From 62fa3499aa19c75ae8f5ba2cece42824f6541e54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:14:20 +0100 Subject: [PATCH 055/125] python310Packages.google-cloud-texttospeech: add changelog to meta --- .../python-modules/google-cloud-texttospeech/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 6920239879fc..34c211c471be 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Text-to-Speech API client library"; homepage = "https://github.com/googleapis/python-texttospeech"; + changelog = "https://github.com/googleapis/python-texttospeech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From b8728c3055489995e1dcb09464cfa0594a76c5bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:16:04 +0100 Subject: [PATCH 056/125] python310Packages.google-cloud-texttospeech: 2.12.3 -> 2.13.0 Changelog: https://github.com/googleapis/python-texttospeech/blob/v2.13.0/CHANGELOG.md --- .../google-cloud-texttospeech/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 34c211c471be..dc808df9df7f 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -1,32 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.12.3"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gnSl/W0mTv6It//+xV5ti0Rd6io1Gh4yxd0arrbEPtQ="; + hash = "sha256-jpDwERTLRmS1mO2O2OboZa6AAUh3k/Dyg77TCVTqLok="; }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock From cacebfa9eb929b5c6d803194297c61b1d8a05b2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:17:42 +0100 Subject: [PATCH 057/125] python310Packages.google-cloud-tasks: add changelog to meta --- pkgs/development/python-modules/google-cloud-tasks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 8bbaa96f51ce..82e2fc8c027f 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Tasks API API client library"; homepage = "https://github.com/googleapis/python-tasks"; + changelog = "https://github.com/googleapis/python-tasks/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 4481e509725da7a80839a63ce792d297d213bf00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:19:27 +0100 Subject: [PATCH 058/125] python310Packages.google-cloud-tasks: 2.10.4 -> 2.11.0 Changelog: https://github.com/googleapis/python-tasks/blob/v2.11.0/CHANGELOG.md --- .../python-modules/google-cloud-tasks/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 82e2fc8c027f..4e8a51cedde6 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -3,9 +3,9 @@ , fetchPypi , google-api-core , grpc-google-iam-v1 -, libcst , mock , proto-plus +, protobuf , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,22 +13,22 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.10.4"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZQ9PQ75yWEEQNyfqO8EyJ66euqL5na2q1TiIgxz8HXA="; + hash = "sha256-TC2uDnD95NUx1LLLLotZK9tJd6JWZa4MjipcE6k07Mo="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_list_queues" ]; From 31671cf3a570316f365b4678a5a9601cfb75da22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:21:01 +0100 Subject: [PATCH 059/125] python310Packages.google-cloud-speech: add changelog to meta --- pkgs/development/python-modules/google-cloud-speech/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index a0e68cdff34f..7e08649cf4fd 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Speech API client library"; homepage = "https://github.com/googleapis/python-speech"; + changelog = "https://github.com/googleapis/python-speech/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 2173e7d1aca0d11e2e56b13b7b75b81cece682c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:23:00 +0100 Subject: [PATCH 060/125] python310Packages.google-cloud-speech: adjust inputs --- .../python-modules/google-cloud-speech/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 7e08649cf4fd..0bc05828dd19 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -2,11 +2,11 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder , setuptools }: @@ -24,16 +24,16 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - libcst google-api-core proto-plus + protobuf setuptools - ]; + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTestPaths = [ From 73a51fce0902c995b2a039737163221c03005b1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:26:29 +0100 Subject: [PATCH 061/125] python310Packages.google-cloud-spanner: adjust inputs --- .../google-cloud-spanner/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index e5e32526a1cb..1fdf98d3baa3 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-cloud-core , google-cloud-testutils +, grpc-google-iam-v1 , libcst , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio -, sqlparse +, pytestCheckHook , pythonOlder +, sqlparse }: buildPythonPackage rec { @@ -28,16 +29,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-cloud-core grpc-google-iam-v1 - libcst proto-plus + protobuf sqlparse - ]; + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; checkInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' From d630bc8c07f6b11c4529b260bee5637a493b5878 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:28:35 +0100 Subject: [PATCH 062/125] python310Packages.google-cloud-securitycenter: add changelog to meta --- .../python-modules/google-cloud-securitycenter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index bdf3aca4653a..6938f979dc2e 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Security Command Center API API client library"; homepage = "https://github.com/googleapis/python-securitycenter"; + changelog = "https://github.com/googleapis/python-securitycenter/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From aa09980d95750d57049022e26cd9f378042d4c88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:30:35 +0100 Subject: [PATCH 063/125] python310Packages.google-cloud-securitycenter: 1.16.2 -> 1.17.0 Changelog: https://github.com/googleapis/python-securitycenter/blob/v1.17.0/CHANGELOG.md --- .../google-cloud-securitycenter/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 6938f979dc2e..504c86e49926 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -1,37 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, grpc-google-iam-v1 , google-api-core -, libcst -, mock +, grpc-google-iam-v1 , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.16.2"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DU+0gpnWqmtm5nkLoHbEq5k3pnybsEag+aKEp7+HFmo="; + hash = "sha256-wkq0/LEgEQokKzREpOkprKZUK/paP8CgS51anLTy5Dk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock pytestCheckHook pytest-asyncio ]; From 058c66f129e365ffc42db65631e96df4a5c654b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:31:48 +0100 Subject: [PATCH 064/125] python310Packages.google-cloud-secret-manager: add changelog to meta --- .../python-modules/google-cloud-secret-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index f8a0e4053d8e..12d99020fe49 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Secret Manager API API client library"; homepage = "https://github.com/googleapis/python-secret-manager"; + changelog = "https://github.com/googleapis/python-secret-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ siriobalmelli SuperSandro2000 ]; }; From 3aeaac8f0a2acdc2bf5505db49bf9a0b5de94495 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:33:20 +0100 Subject: [PATCH 065/125] python310Packages.google-cloud-secret-manager: 2.12.6 -> 2.13.0 Changelog: https://github.com/googleapis/python-secret-manager/blob/v2.13.0/CHANGELOG.md --- .../google-cloud-secret-manager/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 12d99020fe49..1c2bc12ae371 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -3,37 +3,35 @@ , fetchPypi , google-api-core , grpc-google-iam-v1 -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.12.6"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-equimX9D+MOzWQPvxUw4moAvOYU7qB6B4RkPCTQg7PY="; + hash = "sha256-1BBOEdkh0jVBHtSVEnOsXtaCPF/GuXB90FCZeOmue9I="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ From 81f3bf36049342f85bc8c4e3b4e30d4282579cd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:34:36 +0100 Subject: [PATCH 066/125] python310Packages.google-cloud-runtimeconfig: add changelog to meta --- .../python-modules/google-cloud-runtimeconfig/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 3b435ac5adac..000d91139269 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -28,11 +28,14 @@ buildPythonPackage rec { rm -r google ''; - pythonImportsCheck = [ "google.cloud.runtimeconfig" ]; + pythonImportsCheck = [ + "google.cloud.runtimeconfig" + ]; meta = with lib; { description = "Google Cloud RuntimeConfig API client library"; - homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; + homepage = "https://github.com/googleapis/python-runtimeconfig"; + changelog = "https://github.com/googleapis/python-runtimeconfig/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 2ae853805bfc33a0fd6cd0bf21800f557f4fcae0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:36:55 +0100 Subject: [PATCH 067/125] python310Packages.google-cloud-runtimeconfig: disable on older Python releases --- .../google-cloud-runtimeconfig/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 000d91139269..15e80892d9cb 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -5,23 +5,35 @@ , google-cloud-core , mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; version = "0.33.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; + hash = "sha256-MPmyvm2FSrUzb1y5i4xl5Cqea6sxixLoZ7V1hxNi7hw="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # Client tests require credentials - disabledTests = [ "client_options" ]; + disabledTests = [ + "client_options" + ]; # prevent google directory from shadowing google imports preCheck = '' From e31c72e3558f017ebaddc2b8d802ccb3281e5046 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:38:04 +0100 Subject: [PATCH 068/125] python310Packages.google-cloud-resource-manager: add changelog to meta --- .../python-modules/google-cloud-resource-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 7291702a83d3..dbd8cbe67295 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Resource Manager API client library"; homepage = "https://github.com/googleapis/python-resource-manager"; + changelog = "https://github.com/googleapis/python-resource-manager/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From e24652ee833d681e1055ce66c9e3ce6d71eaf108 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:40:07 +0100 Subject: [PATCH 069/125] python310Packages.google-cloud-resource-manager: 1.6.3 -> 1.7.0 Changelog: https://github.com/googleapis/python-resource-manager/blob/v1.7.0/CHANGELOG.md --- .../google-cloud-resource-manager/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index dbd8cbe67295..2237a468f004 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -1,25 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, google-cloud-core , google-api-core +, google-cloud-core , grpc-google-iam-v1 , proto-plus -, mock +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.6.3"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bPipp05loDhXiWlnx5MHt1gFx1Kt47xBIk5hZ3dLyck="; + hash = "sha256-n66Yl3xSGJNxyn2LJVGO8fuXtCKFHLRcCeoWhvxCCok="; }; propagatedBuildInputs = [ @@ -27,10 +28,11 @@ buildPythonPackage rec { google-cloud-core grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock + pytest-asyncio pytestCheckHook ]; From 1a8ca13f38568c0c4734d2f147786686def1cac0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:41:22 +0100 Subject: [PATCH 070/125] python310Packages.google-cloud-redis: add changelog to meta --- pkgs/development/python-modules/google-cloud-redis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 96b20dcc2607..71e557f7c0d7 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Memorystore for Redis API client library"; homepage = "https://github.com/googleapis/python-redis"; + changelog = "https://github.com/googleapis/python-redis/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From a2b04f0bf33f9283d84cfa9d2811f8188f1f9792 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:43:09 +0100 Subject: [PATCH 071/125] python310Packages.google-cloud-redis: 2.9.3 -> 2.10.0 Changelog: https://github.com/googleapis/python-redis/blob/v2.10.0/CHANGELOG.md --- .../python-modules/google-cloud-redis/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 71e557f7c0d7..96589bece702 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -2,34 +2,32 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.9.3"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-81RPV8GaSU0jpYTyjFWxakpbuBz994eA7I/wyTxmg8Y="; + hash = "sha256-byppjhrBLentcRwMSbuaf3L7wU+rkP2Z92j2zzEPdY0="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock pytestCheckHook pytest-asyncio ]; From 12cfc36120c76e14d6c248160703c4d04c3f4a68 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:44:39 +0100 Subject: [PATCH 072/125] python310Packages.google-cloud-pubsub: add changelog to meta --- .../development/python-modules/google-cloud-pubsub/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 29ddb2501391..162535b6ec9a 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -56,7 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = "https://pypi.org/project/google-cloud-pubsub"; + homepage = "https://github.com/googleapis/python-pubsub"; + changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 4a946692853a12b887f0eb55ec127adf147dedaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:47:31 +0100 Subject: [PATCH 073/125] python310Packages.google-cloud-pubsub: adjust inputs --- .../google-cloud-pubsub/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 162535b6ec9a..83e17cd096b1 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -1,15 +1,16 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , google-api-core , google-cloud-testutils , grpc-google-iam-v1 +, grpcio , grpcio-status , libcst -, mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: @@ -26,16 +27,23 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - grpc-google-iam-v1 google-api-core + grpc-google-iam-v1 + grpcio grpcio-status libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; checkInputs = [ google-cloud-testutils - mock pytestCheckHook pytest-asyncio ]; From ba0f01af456711a1e8b2e2652a2bfd8287b738f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:49:08 +0100 Subject: [PATCH 074/125] python310Packages.google-cloud-os-config: add changelog to meta --- .../python-modules/google-cloud-os-config/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 18f7dafae7a5..d1d716cd2085 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud OS Config API client library"; homepage = "https://github.com/googleapis/python-os-config"; + changelog = "https://github.com/googleapis/python-os-config/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 72a9d062f04f8983d683d760ee1129c0408ca945 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:50:39 +0100 Subject: [PATCH 075/125] python310Packages.google-cloud-os-config: 1.12.4 -> 1.13.0 Changelog: https://github.com/googleapis/python-os-config/blob/v1.13.0/CHANGELOG.md --- .../google-cloud-os-config/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index d1d716cd2085..d6733d4d9319 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,8 +2,7 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock +, protobuf , proto-plus , pytestCheckHook , pytest-asyncio @@ -12,26 +11,25 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.12.4"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SmzCo/nh6FbTt+7lw4XAyF5gwDHQCOz8Nbl05/AkDfY="; + hash = "sha256-CHAiHhXjrLMz7On7Gm5H4fIY3Sq8R2whsI9+D9xXDIM="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ From bdf27d0ec3b23a0b4f87ed48909db45f0fcffa07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:52:03 +0100 Subject: [PATCH 076/125] python310Packages.google-cloud-org-policy: add changelog to meta --- .../python-modules/google-cloud-org-policy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 8c3f2f683e70..64a7efd6713c 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -21,6 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Protobufs for Google Cloud Organization Policy."; homepage = "https://github.com/googleapis/python-org-policy"; + changelog = "https://github.com/googleapis/python-org-policy/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; }; From 75825e1cfc4729e7102621087a04373250874329 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:56:47 +0100 Subject: [PATCH 077/125] python310Packages.google-cloud-org-policy: 1.4.1 -> 1.5.0 Changelog: https://github.com/googleapis/python-org-policy/blob/v1.5.0/CHANGELOG.md --- .../google-cloud-org-policy/default.nix | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 64a7efd6713c..8f708fc65213 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -1,25 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, google-api-core, mock, proto-plus, protobuf, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.4.1"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KYZvlpPqGy0zGDSZF3y6MsFZyb9M+88HGYp4NpPCiSY="; + hash = "sha256-fA8O/pdUNgY3dwj17D7aoHUjzaXpMmL3w0TU6A6gqHo="; }; - propagatedBuildInputs = [ google-api-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; - # prevent google directory from shadowing google imports + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + # Prevent google directory from shadowing google imports preCheck = '' rm -r google ''; - checkInputs = [ mock protobuf pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ "google.cloud.orgpolicy" ]; + + pythonImportsCheck = [ + "google.cloud.orgpolicy" + ]; meta = with lib; { - description = "Protobufs for Google Cloud Organization Policy."; + description = "Protobufs for Google Cloud Organization Policy"; homepage = "https://github.com/googleapis/python-org-policy"; changelog = "https://github.com/googleapis/python-org-policy/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; From ff5a1f52894ab6161d4bab370b0bd55aee44857f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 16:57:44 +0100 Subject: [PATCH 078/125] python310Packages.google-cloud-monitoring: add changelog to meta --- .../python-modules/google-cloud-monitoring/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 935d82a410a2..390aaf14b618 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Monitoring API client library"; homepage = "https://github.com/googleapis/python-monitoring"; + changelog = "https://github.com/googleapis/python-monitoring/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 0e0d95f7212f48dfe05bca405e85c434ce8df574 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:01:18 +0100 Subject: [PATCH 079/125] python310Packages.google-cloud-monitoring: adjust inputs --- .../google-cloud-monitoring/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 390aaf14b618..f4e381ace9df 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -3,12 +3,12 @@ , fetchPypi , google-api-core , google-cloud-testutils -, libcst +, mock , proto-plus , pandas , pytestCheckHook , pytest-asyncio -, mock +, protobuf , pythonOlder }: @@ -25,18 +25,23 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - libcst google-api-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + pandas = [ + pandas + ]; + }; checkInputs = [ google-cloud-testutils mock - pandas pytestCheckHook pytest-asyncio - ]; + ] ++ passthru.optional-dependencies.pandas; disabledTests = [ # requires credentials From 07a934e000f7e61da80b7097ef1bd14a2264d8c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:02:54 +0100 Subject: [PATCH 080/125] python310Packages.google-cloud-language: add changelog to meta --- .../python-modules/google-cloud-language/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 84b2c14ee700..a1e4e9cc4cf2 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KAZmikDsTmNarRo9fxrTR5EtGfSYm1i4rP1iX8pa6Zo="; + hash = "sha256-KAZmikDsTmNarRo9fxrTR5EtGfSYm1i4rP1iX8pa6Zo="; }; propagatedBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Natural Language API client library"; homepage = "https://github.com/googleapis/python-language"; + changelog = "https://github.com/googleapis/python-language/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 3a9ea3107a8fc4e6fe9228aafb53f3b223ba589e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:04:19 +0100 Subject: [PATCH 081/125] python310Packages.google-cloud-language: 2.6.1 -> 2.7.0 Changelog: https://github.com/googleapis/python-language/blob/v2.7.0/CHANGELOG.md --- .../google-cloud-language/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index a1e4e9cc4cf2..21db9ecf9dfb 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -2,34 +2,32 @@ , buildPythonPackage , fetchPypi , google-api-core -, libcst -, mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KAZmikDsTmNarRo9fxrTR5EtGfSYm1i4rP1iX8pa6Zo="; + hash = "sha256-2BVkbQt6y9WGLjFBCt4pXPtGcmcsF8FxThOUIu7CgR8="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ - mock pytestCheckHook pytest-asyncio ]; From 1012b4dcd3e159852be7d5e9290d9f79709ea394 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:05:19 +0100 Subject: [PATCH 082/125] python310Packages.google-cloud-firestore: add changelog to meta --- .../python-modules/google-cloud-firestore/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 5abd123f8f1a..2e891344e7a4 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; + hash = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Firestore API client library"; homepage = "https://github.com/googleapis/python-firestore"; + changelog = "https://github.com/googleapis/python-firestore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 3a3c6a90d5d3081eef3d27a50da45b65e7237cb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:08:11 +0100 Subject: [PATCH 083/125] python310Packages.google-cloud-firestore: 2.7.2 -> 2.7.3 Changelog: https://github.com/googleapis/python-firestore/blob/v2.7.3/CHANGELOG.md --- .../google-cloud-firestore/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 2e891344e7a4..dfd31c499bbd 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -1,37 +1,43 @@ { lib +, aiounittest , buildPythonPackage , fetchPypi -, aiounittest , google-api-core -, google-cloud-testutils , google-cloud-core +, google-cloud-testutils , mock , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.7.2"; + version = "2.7.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yGB6dLcRxEuqPYGEbpOI5DInos/1ILWmzeXN+ck/W+g="; + hash = "sha256-rH2aIst5XHEq93FXxlfDreROIWnM8pmq2UOOg9T2kjU="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ aiounittest google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' From 927961887f9dd84c566c15ca7dd99a9455f9a0ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:09:22 +0100 Subject: [PATCH 084/125] python310Packages.google-cloud-error-reporting: add changelog to meta --- .../python-modules/google-cloud-error-reporting/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 5ec7903b9e2d..c6ec7408bc95 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # require credentials + # Tests require credentials "test_report_error_event" "test_report_exception" ]; @@ -50,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Error Reporting API client library"; homepage = "https://github.com/googleapis/python-error-reporting"; + changelog = "https://github.com/googleapis/python-error-reporting/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From a9c8268edb04dc3151e042f775bf8328d00220ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:13:08 +0100 Subject: [PATCH 085/125] python310Packages.google-cloud-audit-log: add missing input --- .../python-modules/google-cloud-audit-log/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 2ac9d4eec216..e1276718efca 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -3,6 +3,7 @@ , fetchPypi , googleapis-common-protos , protobuf +, pythonOlder }: buildPythonPackage rec { From a8ae8b0137e115f8bce4ab44c86a882119df835a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:14:22 +0100 Subject: [PATCH 086/125] python310Packages.google-cloud-error-reporting: 1.6.3 -> 1.7.0 Changelog: https://github.com/googleapis/python-error-reporting/blob/v1.7.0/CHANGELOG.md --- .../google-cloud-error-reporting/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index c6ec7408bc95..8a7b7eaf6af5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -1,33 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook +, google-api-core , google-cloud-logging , google-cloud-testutils -, libcst , mock , proto-plus +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.6.3"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7QR4NS98MtJ8aMLC+qQeTrK1Rv5kw6XlZhSKbatrZFY="; + hash = "sha256-biI1dbn7lpD1KUGkOV5NMLJlYxZTfH+zW6i65fbJWko="; }; propagatedBuildInputs = [ + google-api-core google-cloud-logging - libcst proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-cloud-testutils From cb0424fcaf3e42b402224e3b8cfeb31fbca112d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:16:52 +0100 Subject: [PATCH 087/125] python310Packages.google-auth-httplib2: add changelog to meta --- .../python-modules/google-auth-httplib2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 0109175ab85c..ee67860201db 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -5,17 +5,21 @@ , google-auth , httplib2 , mock -, pytestCheckHook , pytest-localserver +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-auth-httplib2"; version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"; + hash = "sha256-oHw5/WMr7KzT8HcY39YCG/OWl48DrTzkMh0GABXMMKw="; }; propagatedBuildInputs = [ @@ -33,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Authentication Library: httplib2 transport"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; + changelog = "https://github.com/googleapis/google-auth-library-python-httplib2/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 3485a2ccc828f03d058bc1eb9760c40509c350e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:18:26 +0100 Subject: [PATCH 088/125] python310Packages.google-cloud-bigquery: add changelog to meta --- .../development/python-modules/google-cloud-bigquery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 1c71878ed0b4..0ea8f900570a 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -100,6 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google BigQuery API client library"; homepage = "https://github.com/googleapis/python-bigquery"; + changelog = "https://github.com/googleapis/python-bigquery/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From bbadd16f6ecf71b8575bd1d582364b34abcccbc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 17:32:10 +0100 Subject: [PATCH 089/125] python310Packages.google-cloud-bigquery: 3.3.5 -> 3.4.1 Changelog: https://github.com/googleapis/python-bigquery/blob/v3.4.1/CHANGELOG.md --- .../google-cloud-bigquery/default.nix | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0ea8f900570a..bc80fc531ffe 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -1,58 +1,85 @@ { lib , buildPythonPackage -, fetchPypi -, pytestCheckHook , db-dtypes +, fetchPypi , freezegun +, google-api-core , google-cloud-bigquery-storage , google-cloud-core , google-cloud-datacatalog , google-cloud-storage , google-cloud-testutils , google-resumable-media +, grpcio , ipython , mock , pandas , proto-plus +, protobuf , psutil , pyarrow , pytest-xdist +, pytestCheckHook +, python-dateutil , pythonOlder +, requests +, tqdm }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.3.5"; + version = "3.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+7ZXmcAnVN3K7ZgfSotrAhtpzADUzZw1yh1swnLq2dE="; + hash = "sha256-iEaJcU2YojZN3px8Nn6CKMcRYQi7rXpjZd/eORY4mFs="; }; propagatedBuildInputs = [ + grpcio + google-api-core google-cloud-core google-cloud-bigquery-storage google-resumable-media proto-plus - pyarrow - ]; + protobuf + requests + python-dateutil + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + bqstorage = [ + google-cloud-bigquery-storage + grpcio + pyarrow + ]; + pandas = [ + db-dtypes + pandas + pyarrow + ]; + tqdm = [ + tqdm + ]; + ipython = [ + ipython + ]; + }; checkInputs = [ - db-dtypes freezegun google-cloud-testutils - ipython mock - pandas psutil google-cloud-datacatalog google-cloud-storage pytestCheckHook pytest-xdist - ]; + ] ++ passthru.optional-dependencies.pandas + ++ passthru.optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' @@ -83,10 +110,12 @@ buildPythonPackage rec { "test__initiate_resumable_upload_mtls" "test__initiate_resumable_upload_with_retry" "test_table_clones" + "test_context_with_default_connection" + "test_context_with_custom_connection" ]; disabledTestPaths = [ - # requires credentials + # Tests require credentials "tests/system/test_query.py" "tests/system/test_job_retry.py" "tests/system/test_pandas.py" From 3b1e98a1ade36bbd2cd86716ca6bb02d9079e4d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 18:24:58 +0100 Subject: [PATCH 090/125] python310Packages.google-cloud-bigquery-storage: add optional-dependencies --- .../google-cloud-bigquery-storage/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 650bb81b4b7b..9972918a7c2c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -1,24 +1,27 @@ { lib , buildPythonPackage +, fastavro , fetchPypi , google-api-core , google-auth , google-cloud-bigquery +, pandas , protobuf +, pyarrow , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.17.0"; + version = "2.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AsEcoAmOg+J/g8P5o51PzO9R5z0Nce9zQ/EiIYhmaFw="; + hash = "sha256-5qyk97b06tuH+FEJBhd1Y1GOFYfIt7FivPjhyede9BY="; }; propagatedBuildInputs = [ @@ -26,6 +29,18 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; + passthru.optional-dependencies = { + fastavro = [ + fastavro + ]; + pandas = [ + pandas + ]; + pyarrow = [ + pyarrow + ]; + }; + checkInputs = [ google-auth google-cloud-bigquery From e2620c1169c1a923a36228e1241838c32ae4a70c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 18:32:49 +0100 Subject: [PATCH 091/125] python310Packages.google-cloud-spanner: add missing input --- .../development/python-modules/google-cloud-spanner/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 1fdf98d3baa3..0efc0a07d9f8 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, google-api-core , google-cloud-core , google-cloud-testutils , grpc-google-iam-v1 @@ -27,6 +28,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + google-api-core google-cloud-core grpc-google-iam-v1 proto-plus From 3d09de4c8a566be269f35d48f5325f45f996a72f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 18:39:01 +0100 Subject: [PATCH 092/125] python310Packages.google-cloud-datastore: add changelog to meta --- .../python-modules/google-cloud-datastore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index a950f09050c6..037d5529d57b 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -66,6 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Datastore API client library"; homepage = "https://github.com/googleapis/python-datastore"; + changelog = "https://github.com/googleapis/python-datastore/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From a5a9199cdb23434ec1b8a6721403bd106a122522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 18:40:59 +0100 Subject: [PATCH 093/125] python310Packages.google-cloud-datastore: adjust inputs --- .../google-cloud-datastore/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 037d5529d57b..8da81a155a30 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -3,12 +3,13 @@ , fetchPypi , google-api-core , google-cloud-core -, libcst -, proto-plus -, mock -, pytestCheckHook -, pytest-asyncio , google-cloud-testutils +, libcst +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: @@ -28,7 +29,14 @@ buildPythonPackage rec { google-api-core google-cloud-core proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + passthru.optional-dependencies = { + libcst = [ + libcst + ]; + }; passthru.optional-dependencies = { libcst = [ From 41f26ccd7618d8f48ec1498d3b8dc1cc17b0cfd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 19:44:36 +0100 Subject: [PATCH 094/125] python310Packages.google-cloud-dlp: add changelog to meta --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 331b6d8adb7b..e9c2123ac340 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # requires credentials + # Test requires credentials "test_inspect_content" ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; homepage = "https://github.com/googleapis/python-dlp"; + changelog = "https://github.com/googleapis/python-dlp/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From a08fc69769a40f2f5203d57964c4964e95696c59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 19:47:13 +0100 Subject: [PATCH 095/125] python310Packages.google-cloud-dlp: 3.9.2 -> 3.10.0 Changelog: https://github.com/googleapis/python-dlp/blob/v3.10.0/CHANGELOG.md --- .../google-cloud-dlp/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index e9c2123ac340..dfa8c22c5cb4 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -3,33 +3,31 @@ , fetchPypi , google-api-core , google-cloud-testutils -, libcst -, proto-plus -, pytestCheckHook -, pytest-asyncio -, pytz , mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.9.2"; + version = "3.10.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yoiHO4/dhFDGZJB+WiouyBtbTQWIecwaIvR+qw8MGBU="; + hash = "sha256-0/bTCi1BhTrM8VJLuFZ9gZc0uwZqpAhcwoPt25flvkI="; }; propagatedBuildInputs = [ google-api-core - libcst proto-plus - pytz - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ google-cloud-testutils From 3c02ba1b811b83e3ffd6a70158a5728e3ca8007b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Dec 2022 19:53:03 +0100 Subject: [PATCH 096/125] python310Packages.google-cloud-datastore: remove duplicate entry --- .../python-modules/google-cloud-datastore/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 8da81a155a30..72b9d4efb80e 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -38,12 +38,6 @@ buildPythonPackage rec { ]; }; - passthru.optional-dependencies = { - libcst = [ - libcst - ]; - }; - checkInputs = [ google-cloud-testutils mock From 753dccdfc6eae33050a08d38fb3879747fb138b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Dec 2022 23:00:36 +0100 Subject: [PATCH 097/125] python310Packages.google-cloud-logging: 3.3.1 -> 3.4.0 Changelog: https://github.com/googleapis/python-logging/blob/v3.4.0/CHANGELOG.md --- .../google-cloud-logging/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 2fb93c8a73d1..7a6e2cfcaf27 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -1,32 +1,34 @@ { lib , buildPythonPackage -, fetchPypi , django +, fetchPypi , flask , google-api-core , google-cloud-appengine-logging , google-cloud-audit-log , google-cloud-core , google-cloud-testutils +, grpc-google-iam-v1 , mock , pandas , proto-plus -, pytestCheckHook +, protobuf , pytest-asyncio +, pytestCheckHook , pythonOlder , rich }: buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.3.1"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bxFBWi6cx7TeeofMP59XVRX9aDpCP2N5lAkUpWYW1wU="; + hash = "sha256-zeD1n625F0aHRiUrr0sR6gD21obvAhORg+r5IfOu5rQ="; }; propagatedBuildInputs = [ @@ -34,8 +36,10 @@ buildPythonPackage rec { google-cloud-appengine-logging google-cloud-audit-log google-cloud-core + grpc-google-iam-v1 proto-plus - ]; + protobuf + ] ++ google-api-core.optional-dependencies.grpc; checkInputs = [ django @@ -56,10 +60,16 @@ buildPythonPackage rec { preCheck = '' # prevent google directory from shadowing google imports rm -r google - # requires credentials - rm tests/system/test_system.py tests/unit/test__gapic.py ''; + disabledTestPaths = [ + # Tests require credentials + "tests/system/test_system.py" + "tests/unit/test__gapic.py" + # Exclude performance tests + "tests/performance/test_performance.py" + ]; + pythonImportsCheck = [ "google.cloud.logging" "google.cloud.logging_v2" From e5c2ffab8915dac16086b8840346cc336a8979fe Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Sun, 1 Jan 2023 01:29:52 +0900 Subject: [PATCH 098/125] whitesur-icon-theme: etc Add an option to use alternative icon set. --- pkgs/data/icons/whitesur-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 80f6b5ce24ae..d665c9f2b0d7 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -6,6 +6,7 @@ , jdupes , boldPanelIcons ? false , blackPanelIcons ? false +, alternativeIcons ? false , themeVariants ? [] }: @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation rec { ./install.sh --dest $out/share/icons \ --name WhiteSur \ --theme ${builtins.toString themeVariants} \ + ${lib.optionalString alternativeIcons "--alternative"} \ ${lib.optionalString boldPanelIcons "--bold"} \ ${lib.optionalString blackPanelIcons "--black"} From 988c2c07e48e8ae1547f763656d80401d9cb39bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Jan 2023 15:33:41 +0100 Subject: [PATCH 099/125] trivy: 0.35.0 -> 0.36.0 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.36.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 9200dd917495..14e62fa0612e 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0lEKXCQ7os6hyqEuugNI8ogZiqJZq58VGafEKrcmV3I="; + sha256 = "sha256-5yAfF/iRAbCJFXEcdhg7vqiMTpw7NNixFaQU93uSv6I="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-cl6EShtXhe72fbKIMbma9pEGLPBVSNZMiHWi94BbkMM="; + vendorSha256 = "sha256-9oG6xJ0D6SulN6ErC/F5Ycmly4wp+GCF8lftu+xoagE="; excludedPackages = "misc"; From 4cfcb6502fcd2981e0aad171420be9ed3c4bc27f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Jan 2023 16:37:10 +0100 Subject: [PATCH 100/125] metasploit: 6.2.32 -> 6.2.33 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 12 ++++++------ pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 18 +++++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 44bc53c3758a..af741dbed214 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.32" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.33" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 0b6562f27423..d68346b54c32 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 70f696d7322148eba2fca49c5219dcb9a0133c6e - ref: refs/tags/6.2.32 + revision: c2aca5f1d6a798c3c595ef6953172def7bf532d5 + ref: refs/tags/6.2.33 specs: - metasploit-framework (6.2.32) + metasploit-framework (6.2.33) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,7 +128,7 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.684.0) + aws-partitions (1.686.0) aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -249,7 +249,7 @@ GEM metasploit_payloads-mettle (1.0.20) method_source (1.0.0) mini_portile2 (2.8.1) - minitest (5.16.3) + minitest (5.17.0) mqtt (0.5.0) msgpack (1.6.0) multi_json (1.15.0) @@ -290,7 +290,7 @@ GEM puma (6.0.1) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.4) + rack (2.2.5) rack-protection (3.0.5) rack rack-test (2.0.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 59954f489397..5241622aa0e8 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.32"; + version = "6.2.33"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-uadIhrmrvdxzp4PchPHOy9beODME0hhgNqEqGqxyAZ8="; + sha256 = "sha256-b7MBY+rQxDlXBJumtA7Kqm2yXDP8hEVaCfo8ydreWoY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 31123befc2d8..1dbe5352f05a 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16jpljblpy5drx2fj8nwsw41mmwp7xkadhrigp4rsiny4lb80qg8"; + sha256 = "07gdradgxbkr5vjnc4gxcm01sahidx6yqc9fr8a8i1z4ivydzhz9"; type = "gem"; }; - version = "1.684.0"; + version = "1.686.0"; }; aws-sdk-core = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "70f696d7322148eba2fca49c5219dcb9a0133c6e"; - sha256 = "17q1fan1lam16rh1ilh46cwdxmnbrvqq9p43lxrxrgdbp634i9xr"; + rev = "c2aca5f1d6a798c3c595ef6953172def7bf532d5"; + sha256 = "11jsvvdcjg7s15d4b17w6dfb4vdar87b99lv0ibkki6hx9ih3cvg"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.32"; + version = "6.2.33"; }; metasploit-model = { groups = ["default"]; @@ -676,10 +676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; type = "gem"; }; - version = "5.16.3"; + version = "5.17.0"; }; mqtt = { groups = ["default"]; @@ -947,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "14xjykbmngjhb4p02b7yghf0gqgqjfpi6i028x9g6q6xs782ci3j"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.5"; }; rack-protection = { groups = ["default"]; From e8a2f9fba654aa43326d5da1b9e84c9ed4cc1236 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 1 Jan 2023 17:26:22 +0100 Subject: [PATCH 101/125] dataexplorer: pin jdk17 Since the default jdk changed to jdk19, DataExplorer fails at startup: ```console $ ./result/bin/DataExplorer java.lang.NullPointerException: Cannot read field "width" because the return value of "gde.config.Settings.getWindow()" is null at gde.ui.DataExplorer.execute(DataExplorer.java:406) at gde.GDE.main(GDE.java:544) ``` Therefore, pin to jdk17, which is also the latest recommended version by upstream: > The only requirement is the installation of a Java run-time of version > 8 to Java 17 for the 32 bit versions and Java 11 to 17 for the 64 bit > versions, such as IcedTea or open JDK. https://www.nongnu.org/dataexplorer/index.html#Introduction --- .../science/electronics/dataexplorer/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix index 9d06f614870a..5df312cd153b 100644 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , jdk -, jre , ant , makeWrapper }: @@ -37,11 +36,11 @@ stdenv.mkDerivation rec { # but it hardcodes bash shebang and does not pin the java path. # So we create our own wrapper, using similar cmdline args as upstream. mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ + makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \ --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ --set SWT_GTK3 0 - makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ + makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \ --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ --set SWT_GTK3 0 \ --set LIBOVERLAY_SCROLLBAR 0 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4469b008c135..98a28915096c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36311,7 +36311,10 @@ with pkgs; csxcad = callPackage ../applications/science/electronics/csxcad { }; - dataexplorer = callPackage ../applications/science/electronics/dataexplorer { }; + dataexplorer = callPackage ../applications/science/electronics/dataexplorer { + # executable fails at startup for jdk > 17 + jdk = jdk17; + }; diylc = callPackage ../applications/science/electronics/diylc { }; From a00e5fe8965e15f946249175f77ac7f4f1ba742f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 1 Jan 2023 17:51:56 +0100 Subject: [PATCH 102/125] cadaver: 0.23.3 -> 0.24 Changelog: https://github.com/notroj/cadaver/blob/0.24/NEWS --- pkgs/tools/networking/cadaver/configure.patch | 20 --------- pkgs/tools/networking/cadaver/default.nix | 44 +++++++++++-------- 2 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 pkgs/tools/networking/cadaver/configure.patch diff --git a/pkgs/tools/networking/cadaver/configure.patch b/pkgs/tools/networking/cadaver/configure.patch deleted file mode 100644 index b618099b371a..000000000000 --- a/pkgs/tools/networking/cadaver/configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.orig -+++ b/configure -@@ -9595,7 +9595,7 @@ fi - $as_echo "$ne_cv_lib_neon" >&6; } - if test "$ne_cv_lib_neon" = "yes"; then - ne_cv_lib_neonver=no -- for v in 27 28 29; do -+ for v in 27 28 29 30 31; do - case $ne_libver in - 0.$v.*) ne_cv_lib_neonver=yes ;; - esac -@@ -10328,7 +10328,7 @@ fi - $as_echo "$ne_cv_lib_neon" >&6; } - if test "$ne_cv_lib_neon" = "yes"; then - ne_cv_lib_neonver=no -- for v in 27 28 29; do -+ for v in 27 28 29 30 31; do - case $ne_libver in - 0.$v.*) ne_cv_lib_neonver=yes ;; - esac diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index e8c57e529cf3..d94c89371b1b 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,35 +1,41 @@ -{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib, openssl }: +{ lib +, stdenv +, fetchurl +, neon +, pkg-config +, zlib +, openssl +}: stdenv.mkDerivation rec { pname = "cadaver"; - version = "0.23.3"; + version = "0.24"; src = fetchurl { - url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz"; - sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; + url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz"; + hash = "sha256-Rs/y8+vTLNMoNoEspHvMdTU/wr51fwk9qIwN2PEP1fY="; }; - patches = [ - (fetchpatch { - url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver"; - name = "disable-sslv2.patch"; - sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; - }) - # Cadaver also works with newer versions of neon than stated - # in the configure script - ./configure.patch + configureFlags = [ + "--with-ssl" ]; - configureFlags = [ "--with-ssl" "--with-readline" ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ neon readline zlib openssl ]; + buildInputs = [ + neon + openssl + zlib + ]; meta = with lib; { description = "A command-line WebDAV client"; - homepage = "http://www.webdav.org/cadaver"; + homepage = "https://notroj.github.io/cadaver/"; + changelog = "https://github.com/notroj/cadaver/blob/${version}/NEWS"; maintainers = with maintainers; [ ianwookim ]; - license = licenses.gpl2; - platforms = with platforms; linux ++ freebsd ++ openbsd; + license = licenses.gpl2Plus; + platforms = with platforms; linux ++ freebsd ++ openbsd; }; } From fa2180a409e5d89670353d27436d444d0b709d24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 17:12:07 +0000 Subject: [PATCH 103/125] python310Packages.pytest-relaxed: 1.1.5 -> 2.0.0 --- pkgs/development/python-modules/pytest-relaxed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 13838eb326c9..572bd223de20 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.1.5"; + version = "2.0.0"; pname = "pytest-relaxed"; src = fetchPypi { inherit pname version; - sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; + sha256 = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk="; }; # newer decorator versions are incompatible and cause the test suite to fail From ce82d2d926d49b2903353529c9055d4b74f8faa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Jan 2023 02:09:38 +0000 Subject: [PATCH 104/125] python310Packages.aiounifi: 42 -> 43 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 2ac587ddff3a..d96470576f77 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "42"; + version = "43"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vScAWEjdzXSy1gktz+Tfhx13S6OeXZbwZgoS6D1BBtk="; + hash = "sha256-qpFQdNlw6voqccoJwPsnmbU5DtAC6zwtouUeysZ8/0M="; }; propagatedBuildInputs = [ From 9fde2b66f8fe93768432d6354e205402138edf79 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:48:28 +1000 Subject: [PATCH 105/125] terraform-providers: add github token to update-providers --- .github/workflows/update-terraform-providers.yml | 6 ++++-- .../networking/cluster/terraform-providers/update-provider | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 3a6e0ad63e52..079147f7d724 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -11,8 +11,8 @@ permissions: jobs: tf-providers: permissions: - contents: write # for peter-evans/create-pull-request to create branch - pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment + contents: write # for peter-evans/create-pull-request to create branch + pull-requests: write # for peter-evans/create-pull-request to create a PR, for peter-evans/create-or-update-comment to create or update comment if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: @@ -25,6 +25,8 @@ jobs: run: | echo "title=terraform-providers: update $(date -u +"%Y-%m-%d")" >> $GITHUB_OUTPUT - name: update terraform-providers + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions[bot]" diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 5630cbe9ed57..aaa8a44d60c0 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -137,7 +137,7 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" if [[ ${spdx} == 1 ]]; then - spdx="$(curl -L -s "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" + spdx="$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/${org}/${repo}/license" | jq -r '.license.spdx_id')" update_attr spdx "${spdx}" fi From 339c7867b833219c879a01584717b8adac813004 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:08 +0100 Subject: [PATCH 106/125] comby: use dune 3 --- pkgs/development/tools/comby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index d97287ab579b..f77acfffa9b3 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -15,8 +15,8 @@ let ocamlPackages.buildDunePackage rec { inherit pname preBuild; version = "1.8.1"; - useDune2 = true; - minimumOcamlVersion = "4.08.1"; + duneVersion = "3"; + minimalOcamlVersion = "4.08.1"; doCheck = true; src = fetchFromGitHub { From 9f7b13abc58e81061f50c3d76d765c7e35718488 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:12 +0100 Subject: [PATCH 107/125] ocamlPackages.oseq: init at 0.4 --- .../ocaml-modules/oseq/default.nix | 33 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/oseq/default.nix diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix new file mode 100644 index 000000000000..cbe02de2ef11 --- /dev/null +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage +, seq +, containers, qcheck +}: + +buildDunePackage rec { + version = "0.4"; + pname = "oseq"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = pname; + rev = "v${version}"; + hash = "sha256-FoCBvvPwa/dUCrgDEd0clEKAO7EcpedjaO4v+yUO874="; + }; + + propagatedBuildInputs = [ seq ]; + + duneVersion = "3"; + + doCheck = true; + checkInputs = [ + containers + qcheck + ]; + + meta = { + homepage = "https://c-cube.github.io/oseq/"; + description = "Purely functional iterators compatible with standard `seq`"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0f9762d8157b..acf2c564583f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1116,6 +1116,8 @@ let ordering = callPackage ../development/ocaml-modules/ordering { }; + oseq = callPackage ../development/ocaml-modules/oseq { }; + otfm = callPackage ../development/ocaml-modules/otfm { }; otoml = callPackage ../development/ocaml-modules/otoml { }; From 3d8917729deb37eef4a681d39cbd783fe6b639db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:15 +0100 Subject: [PATCH 108/125] ocamlPackages.dscheck: init at 0.1.0 --- .../ocaml-modules/dscheck/default.nix | 28 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dscheck/default.nix diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix new file mode 100644 index 000000000000..0f74fb5e2414 --- /dev/null +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, containers +, oseq +}: + +buildDunePackage rec { + pname = "dscheck"; + version = "0.1.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; + hash = "sha256-zoouFZJcUp71yeluVb1xLUIMcFv99OpkcQQCHkPTKcI="; + }; + + propagatedBuildInputs = [ containers oseq ]; + + doCheck = true; + + meta = { + description = "Traced atomics"; + homepage = "https://github.com/ocaml-multicore/dscheck"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index acf2c564583f..7f08c51140ae 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -330,6 +330,8 @@ let dose3 = callPackage ../development/ocaml-modules/dose3 { }; + dscheck = callPackage ../development/ocaml-modules/dscheck { }; + dssi = callPackage ../development/ocaml-modules/dssi { }; dtoa = callPackage ../development/ocaml-modules/dtoa { }; From f0dfae91ff9a635850e1ff83febcfc503cbbeb8d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:19 +0100 Subject: [PATCH 109/125] ocamlPackages.lockfree: init at 0.3.0 --- .../ocaml-modules/lockfree/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lockfree/default.nix diff --git a/pkgs/development/ocaml-modules/lockfree/default.nix b/pkgs/development/ocaml-modules/lockfree/default.nix new file mode 100644 index 000000000000..c3400d4583e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/lockfree/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage +, dscheck +, qcheck, qcheck-alcotest +}: + +buildDunePackage rec { + pname = "lockfree"; + version = "0.3.0"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/lockfree/releases/download/${version}/lockfree-${version}.tbz"; + hash = "sha256-XdJR5ojFsA7bJ4aZ5rh10NjopE0NjfqQ9KitOLMh3Jo="; + }; + + propagatedBuildInputs = [ dscheck ]; + + doCheck = true; + checkInputs = [ qcheck qcheck-alcotest ]; + + meta = { + description = "Lock-free data structures for multicore OCaml"; + homepage = "https://github.com/ocaml-multicore/lockfree"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7f08c51140ae..68f9ea12ec1e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -739,6 +739,8 @@ let lo = callPackage ../development/ocaml-modules/lo { }; + lockfree = callPackage ../development/ocaml-modules/lockfree { }; + logs = callPackage ../development/ocaml-modules/logs { }; lru = callPackage ../development/ocaml-modules/lru { }; From 62cc26f3f684a97eb894f4e79d125bfefbc8dffa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:22 +0100 Subject: [PATCH 110/125] ocamlPackages.domainslib: init at 0.5.0 --- .../ocaml-modules/domainslib/default.nix | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/ocaml-modules/domainslib/default.nix diff --git a/pkgs/development/ocaml-modules/domainslib/default.nix b/pkgs/development/ocaml-modules/domainslib/default.nix new file mode 100644 index 000000000000..6db57f81c48f --- /dev/null +++ b/pkgs/development/ocaml-modules/domainslib/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl, buildDunePackage +, lockfree +, mirage-clock-unix +}: + +buildDunePackage rec { + pname = "domainslib"; + version = "0.5.0"; + + duneVersion = "3"; + minimalOCamlVersion = "5.0"; + + src = fetchurl { + url = "https://github.com/ocaml-multicore/domainslib/releases/download/v${version}/domainslib-${version}.tbz"; + hash = "sha256-rty+9DUhTUEcN7BPl8G6Q/G/MJ6z/UAn0RPkG8hACwA="; + }; + + propagatedBuildInputs = [ lockfree ]; + + doCheck = true; + checkInputs = [ mirage-clock-unix ]; + + meta = { + homepage = "https://github.com/ocaml-multicore/domainslib"; + description = "Nested-parallel programming"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 68f9ea12ec1e..1ac15512d76d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -328,6 +328,8 @@ let domain-name = callPackage ../development/ocaml-modules/domain-name { }; + domainslib = callPackage ../development/ocaml-modules/domainslib { }; + dose3 = callPackage ../development/ocaml-modules/dose3 { }; dscheck = callPackage ../development/ocaml-modules/dscheck { }; From 3c4aef1767c2f12f80643a52f7cb76d256bf5a2c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Dec 2022 00:12:29 +0100 Subject: [PATCH 111/125] =?UTF-8?q?ocamlPackages.parany:=2012.1.2=20?= =?UTF-8?q?=E2=86=92=20{12.2.2,=2013.0.1}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/parany/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 4f072391deb0..f5af16167955 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -1,20 +1,32 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, cpu, domainslib }: + +let params = + if lib.versionAtLeast ocaml.version "5.00" then { + version = "13.0.1"; + hash = "sha256-OYa0uLsDyzjmXZgWcYUxLhqco4Kp/icfDamNe3En5JQ="; + propagatedBuildInputs = [ domainslib ]; + } else { + version = "12.2.2"; + hash = "sha256-woZ4XJqqoRr/7mDurXYvTbSUUcLBEylzVYBQp1BAOqc="; + propagatedBuildInputs = [ cpu ]; + } +; in buildDunePackage rec { pname = "parany"; - version = "12.1.2"; + inherit (params) version; - useDune2 = true; - minimumOCamlVersion = "4.03.0"; + duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - sha256 = "yOeJzb2Wr6jA4efI9/fuqDCl/Tza3zxT3YjAiJmhHHg="; + inherit (params) hash; }; - propagatedBuildInputs = [ ocamlnet cpu ]; + inherit (params) propagatedBuildInputs; meta = with lib; { inherit (src.meta) homepage; From b92e8e59975283264df8d6e3cbbdc4dd15439223 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 11 Jul 2022 12:47:44 -0700 Subject: [PATCH 112/125] pkgs/top-level/release-cross.nix: add Hydra jobs for pkgsCross.platform.nixStatic This commit causes Hydra to build `nixStatic` on non-NixOS platforms for which nixStatic is known to build correctly. Providing Hydra builds of `nixStatic` on these platforms allows users to bootstrap their local nixpkgs system without either having to: a. Trust binaries that came from a source other than Hydra or b. Fight with their host distribution to satisfy all of nix's large set of build dependencies (this is not easy!) Currently there are two platforms in this set: mips64el-linux-gnuabi64 and powerpc64le-linux-gnu. --- pkgs/top-level/release-cross.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 93e36360bf9c..ccca912db791 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -84,6 +84,17 @@ let buildPackages.binutils = nativePlatforms; mpg123 = nativePlatforms; }; + + # Enabled-but-unsupported platforms for which nix is known to build. + # We provide Hydra-built `nixStatic` for these platforms. This + # allows users to bootstrap their own system without either (a) + # trusting binaries from a non-Hydra source or (b) having to fight + # with their host distribution's versions of nix's numerous + # build dependencies. + nixCrossStatic = { + nixStatic = nativePlatforms; + }; + in { @@ -226,4 +237,8 @@ in # attribute, so there is no way to detect this -- we must add it # as a special case. (builtins.removeAttrs tools ["bootstrapTools"]); + + # Cross-built nixStatic for platforms for enabled-but-unsupported platforms + mips64el-nixCrossStatic = mapTestOnCross lib.systems.examples.mips64el-linux-gnuabi64 nixCrossStatic; + powerpc64le-nixCrossStatic = mapTestOnCross lib.systems.examples.powernv nixCrossStatic; } From 37750130539651a4815cdf58f8a74ce3b22bb741 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 09:59:15 +0100 Subject: [PATCH 113/125] python310Packages.aiounifi: add changelog to meta --- pkgs/development/python-modules/aiounifi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index d96470576f77..96a8ab9d8e52 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { pname = "aiounifi"; version = "43"; + format = "setuptools"; disabled = pythonOlder "3.9"; @@ -46,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with Unifi Controller API"; homepage = "https://github.com/Kane610/aiounifi"; + changelog = "https://github.com/Kane610/aiounifi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; From f0d67d8732cce654a3b2cdae073fab810ab8105d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 10:09:35 +0100 Subject: [PATCH 114/125] evcxr: 0.14.1 -> 0.14.2 ChangeLog: https://github.com/google/evcxr/releases/tag/v0.14.2 --- pkgs/development/interpreters/evcxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 24c271ee7192..eab1f90e5f32 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-sdvBAmINl/3Hv9gnPVruI5lCuSu1VQ9swY0GNJrsEVk="; + sha256 = "sha256-gREAtCh4jerqxhwNslXIXRMLkoj0RlhbIwQXbb8LVws="; }; - cargoSha256 = "sha256-wKoseZTAZOeT0LEHTlnO5cMpYx6sinnQkEVXCYXupAY="; + cargoSha256 = "sha256-xuxWOVSUJVQvSDA5xhFBjdO/ODLA4fzEnzG9p0DRF2Q="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; From f30b16c1f749649670e11b483bcb50694bffd243 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Thu, 15 Dec 2022 21:07:17 +0300 Subject: [PATCH 115/125] =?UTF-8?q?sile:=200.14.5=20=E2=86=92=200.14.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/sile-typesetter/sile/releases/tag/v0.14.6 https://github.com/sile-typesetter/sile/releases/tag/v0.14.7 --- pkgs/tools/typesetting/sile/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index a07b46c3a3b9..e1a75976cfb1 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,5 +1,4 @@ { lib, stdenv -, gnumake42 , darwin , fetchurl , makeWrapper @@ -44,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.5"; + version = "0.14.7"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "01wf0rihksk2ldxgci5vzl3j575vnp6wgk12yd28mwzxkss6n39g"; + sha256 = "01sx4368bws47989zdahhksgy5jgc1qw4hhvpib4qcz3fs6xpx9j"; }; configureFlags = [ @@ -60,7 +59,6 @@ stdenv.mkDerivation rec { gitMinimal pkg-config makeWrapper - gnumake42 ]; buildInputs = [ luaEnv From c66d24a7ff4bc873d706aca9f976dbb8ed34df40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 2 Jan 2023 10:44:48 +0100 Subject: [PATCH 116/125] python310Packages.pytest-relaxed: add changelog to meta - disable on unsupported Python releases - re-enable tests - no longer broken --- .../python-modules/pytest-relaxed/default.nix | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 572bd223de20..46a95c725d47 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -1,44 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, pytest -, six , decorator +, fetchPypi +, invocations +, invoke +, pytest , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "2.0.0"; pname = "pytest-relaxed"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk="; + hash = "sha256-Szc8x1Rmb/YPVCWmnLQUZCwqEc56RsjOBmpzjkCSyjk="; }; - # newer decorator versions are incompatible and cause the test suite to fail - # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric - postPatch = '' - substituteInPlace setup.py \ - --replace "decorator>=4,<5" "decorator>=4" \ - --replace "pytest>=3,<5" "pytest>=3" - ''; + buildInputs = [ + pytest + ]; - buildInputs = [ pytest ]; + propagatedBuildInputs = [ + decorator + ]; - propagatedBuildInputs = [ six decorator ]; + checkInputs = [ + invocations + invoke + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ + "tests" + ]; - # lots of assertion errors mainly around decorator - doCheck = false; + pythonImportsCheck = [ + "pytest_relaxed" + ]; meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; + changelog = "https://github.com/bitprophet/pytest-relaxed/blob/${version}/docs/changelog.rst"; license = licenses.bsd0; - maintainers = [ maintainers.costrouc ]; - # see https://github.com/bitprophet/pytest-relaxed/issues/12 - broken = true; + maintainers = with maintainers; [ costrouc ]; }; } From 2487841947b09c7cba42ee58e0ba6852fe0b7af9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 00:58:11 +0000 Subject: [PATCH 117/125] lite-xl: 2.1.0 -> 2.1.1 --- pkgs/applications/editors/lite-xl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 11dd38752377..577ea527804c 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; + sha256 = "sha256-tZ9bCazs4ygNl5RKFNUtxboaMcG8a7mIz2FuiExX1d4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 100d943cc1bfc11feca48ecc8bdab73108ce7af1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Dec 2022 23:02:32 +0100 Subject: [PATCH 118/125] gitea: 1.17.4 -> 1.18.0 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.18.0 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aa394fb45278..e4c10e98793a 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -14,12 +14,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.17.4"; + version = "1.18.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-koZEr89QhxCf2Dd/7SWiS/ZZoRIBfyu0mbxKknjXPK4="; + sha256 = "sha256-X0KvIB2JvSoh2MR9FcwKObQzod2GxhKeGqIKU5CKTEM="; }; patches = [ From 0cd88dbc60085fd12fc8c6f44a638e5f04a77ce8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:18:49 +0100 Subject: [PATCH 119/125] nixos/gitea: adapt configs for 1.18 Co-authored-by: Izorkin --- nixos/modules/services/misc/gitea.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ceb4c1172854..00e90f5b32b4 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -395,7 +395,7 @@ in ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { - PROTOCOL = "unix"; + PROTOCOL = "http+unix"; HTTP_ADDR = "/run/gitea/gitea.sock"; }) (mkIf (!cfg.enableUnixSocket) { @@ -404,7 +404,6 @@ in }) (mkIf cfg.lfs.enable { LFS_START_SERVER = true; - LFS_CONTENT_PATH = cfg.lfs.contentDir; }) ]; @@ -426,6 +425,10 @@ in oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; + + lfs = mkIf (cfg.lfs.enable) { + PATH = cfg.lfs.contentDir; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { From b5c6d4dabd07be704d8806e6f93de180646aae3c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:15:52 +0100 Subject: [PATCH 120/125] gitea: mark as broken on darwin Build is currently failing: ``` /nix/store/za0pnll14dv61b124n6xxnjapd150lcr-go-1.19.4/share/go/pkg/tool/darwin_amd64/link: running clang failed: exit status 1 Undefined symbols for architecture x86_64: "_pam_start_confdir", referenced from: __cgo_897673d6bfaf_Cfunc_pam_start_confdir in 000032.o _check_pam_start_confdir in 000033.o (maybe you meant: _check_pam_start_confdir, __cgo_897673d6bfaf_Cfunc_check_pam_start_confdir , __cgo_897673d6bfaf_Cfunc_pam_start_confdir ) ld: symbol(s) not found for architecture x86_64 clang-11: error: linker command failed with exit code 1 (use -v to see invocation) error: builder for '/nix/store/zqr2xx5a66km81m8av714sm45gy3ym0g-gitea-1.18.0.drv' failed with exit code 1; ``` --- pkgs/applications/version-management/gitea/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index e4c10e98793a..e90213c971a3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoPackage , fetchurl , makeWrapper @@ -68,5 +69,6 @@ buildGoPackage rec { homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; + broken = stdenv.isDarwin; }; } From 776bc0a8a5f2987c5b8fc182f1e606bff08eaf4f Mon Sep 17 00:00:00 2001 From: Spencer Pogorzelski <34356756+Scoder12@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:43:44 -0700 Subject: [PATCH 121/125] luaPackages.lsqlite3complete: init at 0.9.5-1 --- pkgs/top-level/lua-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5ea0e298f0a6..f4c50b4de890 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -133,6 +133,28 @@ rec { }; }) {}; + lsqlite3complete = callPackage ({ fetchzip }: + buildLuarocksPackage { + pname = "lsqlite3complete"; + version = "0.9.5-1"; + + src = fetchzip { + url = + "http://lua.sqlite.org/index.cgi/zip/lsqlite3_fsl09y.zip?uuid=fsl_9y"; + extension = "zip"; + hash = "sha256-lNiYaqZPw31Y8jzW8i7mETtRh9G3/q5EwckJeCg3EL8="; + }; + + propagatedBuildInputs = [ glibc.out ]; + nativeBuildInputs = [ pkg-config ]; + + meta = { + homepage = "http://lua.sqlite.org/"; + description = "A binding for Lua to the SQLite3 database library"; + license.fullName = "MIT"; + }; + }) {}; + nfd = callPackage ../development/lua-modules/nfd { inherit (pkgs.gnome) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; From 2c4b97d6a0eb6beead204afd4e67c63ea1ad06a0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 2 Jan 2023 21:03:17 +1000 Subject: [PATCH 122/125] Revert "luaPackages.lsqlite3complete: init at 0.9.5-1" This reverts commit 776bc0a8a5f2987c5b8fc182f1e606bff08eaf4f. broke eval --- pkgs/top-level/lua-packages.nix | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index f4c50b4de890..5ea0e298f0a6 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -133,28 +133,6 @@ rec { }; }) {}; - lsqlite3complete = callPackage ({ fetchzip }: - buildLuarocksPackage { - pname = "lsqlite3complete"; - version = "0.9.5-1"; - - src = fetchzip { - url = - "http://lua.sqlite.org/index.cgi/zip/lsqlite3_fsl09y.zip?uuid=fsl_9y"; - extension = "zip"; - hash = "sha256-lNiYaqZPw31Y8jzW8i7mETtRh9G3/q5EwckJeCg3EL8="; - }; - - propagatedBuildInputs = [ glibc.out ]; - nativeBuildInputs = [ pkg-config ]; - - meta = { - homepage = "http://lua.sqlite.org/"; - description = "A binding for Lua to the SQLite3 database library"; - license.fullName = "MIT"; - }; - }) {}; - nfd = callPackage ../development/lua-modules/nfd { inherit (pkgs.gnome) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; From 718eba0289831c676963f253b19aaf8129fa77d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 14:40:29 +0000 Subject: [PATCH 123/125] tinygltf: 2.6.3 -> 2.7.0 --- pkgs/development/libraries/tinygltf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index 0ea26ffa62a7..8d8b6c4c9ed9 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "2.7.0"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo="; + sha256 = "sha256-pIymkC+LzoSPU0jnpBH07ag/04W0c9TmPeDUSYQdgx4="; }; nativeBuildInputs = [ cmake ]; From 365fa435c9b9869b2d9e1ed4546b78ed5d9f51d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 1 Jan 2023 17:04:25 +0100 Subject: [PATCH 124/125] jellyfin-media-player: disable pipewireSupport in mpv to fix segfault Without this change it segfaults when trying to play any media: $ jellyfinmediaplayer Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway. libpng warning: iCCP: known incorrect sRGB profile Logging to /home/bf/.local/share/jellyfinmediaplayer/logs/jellyfinmediaplayer.log Cannot load libcuda.so.1 Segmentation fault (core dumped) The backtrace shows pipewire being at fault: $ coredumpctl debug [...] Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f711428c9bb in core_event_demarshal_remove_id () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/pipewire-0.3/libpipewire-module-protocol-native.so [Current thread is 1 (Thread 0x7f6ffdc87640 (LWP 1360949))] (gdb) bt #0 0x00007f711428c9bb in core_event_demarshal_remove_id () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/pipewire-0.3/libpipewire-module-protocol-native.so #1 0x00007f711428886c in process_remote () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/pipewire-0.3/libpipewire-module-protocol-native.so #2 0x00007f7114288e68 in on_remote_data () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/pipewire-0.3/libpipewire-module-protocol-native.so #3 0x00007f7114310efe in loop_iterate () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/spa-0.2/support/libspa-support.so #4 0x00007f71266fe7f2 in do_loop () from /nix/store/nhffrd7f15dhfbkwzgayq7hhzmdvdy19-pipewire-0.3.63-lib/lib/libpipewire-0.3.so.0 #5 0x00007f7128b08e86 in start_thread () from /nix/store/ayfr5l52xkqqjn3n4h9jfacgnchz1z7s-glibc-2.35-224/lib/libc.so.6 #6 0x00007f7128b8fce0 in clone3 () from /nix/store/ayfr5l52xkqqjn3n4h9jfacgnchz1z7s-glibc-2.35-224/lib/libc.so.6 (gdb) Standalone mpv doesn't segfault (when directly playing the underlying media files). I don't know why. Fixes: b97cda7d44aa78fe915df7b0c18e3d6ed9edd157 ("mpv-unwrapped: 0.34.1 -> 0.35.0") Fixes https://github.com/NixOS/nixpkgs/issues/205141 Ref https://github.com/jellyfin/jellyfin-media-player/issues/341 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc9f67d7255c..d2bcbe5d679f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4817,6 +4817,8 @@ with pkgs; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; + # Disable pipewire to avoid segfault, see https://github.com/jellyfin/jellyfin-media-player/issues/341 + mpv = wrapMpv (mpv-unwrapped.override { pipewireSupport = false; }) {}; }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; From f3736db70dff1b0dd106a922c197152e6cb7977d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 12:58:41 +0000 Subject: [PATCH 125/125] qpwgraph: 0.3.6 -> 0.3.9 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index e9b6e76368e9..3e0206a654bf 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-uN3SAmpurINV+7vw51fWdwnuW2yBxnedY6BXdwn/S2s="; + sha256 = "sha256-KGZ67FF3WlKwUzVV3qz1DR/7i1mXsfXVVyuNoIR9uP0="; }; nativeBuildInputs = [ cmake pkg-config ];