From 130ef76ca7a286dbd8fa0aba50e592299357f96b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Nov 2021 11:40:50 +0100 Subject: [PATCH 1/3] python3Packages.uamqp: 1.4.1 -> 1.4.3 --- .../python-modules/uamqp/default.nix | 62 ++++++++++--------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index b038eb5316a5..15f098d90e48 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,28 +1,46 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage -, fetchPypi -, fetchpatch -, isPy3k , certifi -, cmake -, enum34 -, openssl -, six , CFNetwork +, cmake , CoreFoundation +, enum34 +, fetchpatch +, fetchPypi +, isPy3k +, openssl , Security +, six }: buildPythonPackage rec { pname = "uamqp"; - version = "1.4.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JNGlpu2HvwTGV77WnAQFyvJImHesE2R+ZwMAlhlyk2U="; + sha256 = "sha256-L4IQWnxRRL3yopNT91Mk8KKdph9Vg2PHkGH+86uDu7c="; }; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + CFNetwork + Security + ]; + + propagatedBuildInputs = [ + certifi + openssl + six + ] ++ lib.optionals (!isPy3k) [ + enum34 + ]; + patches = [ (fetchpatch { url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch"; @@ -32,27 +50,15 @@ buildPythonPackage rec { }) ]; - buildInputs = [ - openssl - certifi - six - ] ++ lib.optionals (!isPy3k) [ - enum34 - ] ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - CFNetwork - Security - ]; - dontUseCmakeConfigure = true; - nativeBuildInputs = [ - cmake - ]; - - # has no tests + # Project has no tests doCheck = false; + pythonImportsCheck = [ + "uamqp" + ]; + meta = with lib; { description = "An AMQP 1.0 client library for Python"; homepage = "https://github.com/Azure/azure-uamqp-python"; From 0ecb09b2a3c8edade3aa186ad907b6e0468bc107 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Nov 2021 11:41:39 +0100 Subject: [PATCH 2/3] python3Packages.azure-eventhub: 5.6.0 -> 5.6.1 --- pkgs/development/python-modules/azure-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index bf0a27bf1d2c..95910a66e82e 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.6.0"; + version = "5.6.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "aa6d9e3e9b8b1a5ad211a828de867b85910720722577a4d51cd5aa6889d1d9e9"; + sha256 = "sha256-ssjTesjPFITaB5Uy061podqL14ojeCIVm3LWsF3kY40="; }; propagatedBuildInputs = [ From 6f2adb82875db4346a7a4400422f2e609f991eb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Nov 2021 11:49:05 +0100 Subject: [PATCH 3/3] python3Packages.azure-servicebus: 7.3.3 -> 7.4.0 --- .../azure-servicebus/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 99ff8bbb4e68..bf474c031438 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -1,29 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, uamqp , azure-common , azure-core -, msrestazure +, buildPythonPackage +, fetchPypi , futures ? null +, isodate , isPy3k +, msrestazure +, uamqp }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.3.3"; + version = "7.4.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1c2133909a086bd4329135d6affcc05628e3a7da27afca584a0de8c21fc4e1ac"; + sha256 = "sha256-nlt4wNHI613tK7JB85fBW2LE/FOa8+2aLeT6wzP1PQ4="; }; propagatedBuildInputs = [ - uamqp azure-common azure-core + isodate msrestazure + uamqp ] ++ lib.optionals (!isPy3k) [ futures ]; @@ -32,7 +35,9 @@ buildPythonPackage rec { doCheck = false; # python2 will fail due to pep 420 - pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; + pythonImportsCheck = lib.optionals isPy3k [ + "azure.servicebus" + ]; meta = with lib; { description = "Microsoft Azure Service Bus Client Library";