From 60be290e1f3e198ae04713aa10684b9d8e17b9d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 May 2022 00:29:32 +0000 Subject: [PATCH 1/2] python310Packages.google-cloud-logging: 3.0.0 -> 3.1.1 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index dc60abddb6df..7902b129c663 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg="; + sha256 = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs="; }; postPatch = '' From acf69be9516bf81faaf251e280449ed9854c2106 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 May 2022 09:54:02 +0200 Subject: [PATCH 2/2] python310Packages.google-cloud-logging: disable on older Python releases --- .../python-modules/google-cloud-logging/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 7902b129c663..3d07a80cce40 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -12,22 +12,21 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-logging"; version = "3.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs="; + hash = "sha256-YjR2pdEWEWh84nixN/lDO4HssDlNN8CfhX1TOmBnsQs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "google-cloud-appengine-logging >= 0.1.0, < 1.0.0dev" "google-cloud-appengine-logging >= 0.1.0" - ''; - propagatedBuildInputs = [ google-api-core google-cloud-appengine-logging