From 2c5edad712b9c5c032c4530a87a1ee02258569ea Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:06:13 +0100 Subject: [PATCH 01/14] python3Packages.py-deiviceid: init at 0.1.0 Signed-off-by: Paul Meyer --- .../python-modules/py-deviceid/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/py-deviceid/default.nix diff --git a/pkgs/development/python-modules/py-deviceid/default.nix b/pkgs/development/python-modules/py-deviceid/default.nix new file mode 100644 index 000000000000..ce71dd84ec0b --- /dev/null +++ b/pkgs/development/python-modules/py-deviceid/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-deviceid"; + version = "0.1.0"; + pyproject = true; + + src = fetchPypi { + pname = "py_deviceid"; + inherit version; + hash = "sha256-RZBA/eCyhWPjx1//2Y8zPhmZ5BzEoNCYc+AFC9UNkEk="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "deviceid" + ]; + + meta = { + description = "A simple library to get or create a unique device id for a device in Python"; + homepage = "https://pypi.org/project/py-deviceid/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ katexochen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86e10a672255..5aaa3d98ff60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10740,6 +10740,8 @@ self: super: with self; { proxy-db = callPackage ../development/python-modules/proxy-db { }; + py-deviceid = callPackage ../development/python-modules/py-deviceid { }; + py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; py65 = callPackage ../development/python-modules/py65 { }; From 5dfd51e189def24dc96bdb8b4ad613489e122c5c Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:24:48 +0100 Subject: [PATCH 02/14] python3Packages.azure-synapse-artifact: 0.19.0 -> 0.20.0 Signed-off-by: Paul Meyer --- .../python-modules/azure-synapse-artifacts/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index a952c215ab23..391c90c48328 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.19.0"; + version = "0.20.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-UvCSsiZ315IoDwvMI02JLJ9zjpPI4Ut0wZUQG5uicYQ="; + pname = "azure_synapse_artifacts"; + inherit version; + hash = "sha256-PtbBQvr2LTGRqUOzIiVH93MNTLwQNV0X1k+nfgQhZEo="; }; propagatedBuildInputs = [ From 50e6e66a04e270c0b071fe563f02a43fc0c177ef Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:25:36 +0100 Subject: [PATCH 03/14] python3Packages.azure-mgmt-storage: 21.2.1 -> 22.1.1 Signed-off-by: Paul Meyer --- .../python-modules/azure-mgmt-storage/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 1349ea2c4c24..08f619139a57 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "21.2.1"; + version = "22.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-UDp/+cMSVAkrBlZEX1cov9/aLQnUaoLpcBnqqaHs7GQ="; + pname = "azure_mgmt_storage"; + inherit version; + hash = "sha256-JaqlroxAww4vkfiq5vUpBrBVfpR9XBuYF9T/nezBE0A="; }; build-system = [ setuptools ]; From dca9738aac66d9b1e4cd0dfa3d9fa7ed8967330b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:26:29 +0100 Subject: [PATCH 04/14] azure-cli: 2.69.0 -> 2.70.0 Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/package.nix | 6 ++---- pkgs/by-name/az/azure-cli/python-packages.nix | 16 +--------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index d32dff3beb37..36adc81b5c16 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -26,14 +26,14 @@ }: let - version = "2.69.0"; + version = "2.70.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-bn6x01fVfn/jNWAN3q2oI3CHt5h575lV9YZp0pgBUxg="; + hash = "sha256-vvX/LkG8qA53AxVlvq7FSTqbVblvE5xbDq4V0SINCAk="; }; # put packages that needs to be overridden in the py package scope @@ -188,7 +188,6 @@ py.pkgs.toPythonApplication ( azure-mgmt-databoxedge azure-mgmt-datalake-store azure-mgmt-datamigration - azure-mgmt-devtestlabs azure-mgmt-dns azure-mgmt-eventgrid azure-mgmt-eventhub @@ -342,7 +341,6 @@ py.pkgs.toPythonApplication ( "azure.mgmt.containerservice" "azure.mgmt.cosmosdb" "azure.mgmt.datamigration" - "azure.mgmt.devtestlabs" "azure.mgmt.dns" "azure.mgmt.eventgrid" "azure.mgmt.eventhub" diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index d99d18df6495..a410f5c47161 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -62,6 +62,7 @@ let paramiko pkginfo psutil + py-deviceid pyjwt pyopenssl requests @@ -153,21 +154,6 @@ let }; }); - # ModuleNotFoundError: No module named 'azure.mgmt.containerservice.v2024_09_01' - azure-mgmt-containerservice = super.azure-mgmt-containerservice.overridePythonAttrs (attrs: rec { - version = "33.0.0"; - src = fetchPypi { - pname = "azure_mgmt_containerservice"; # Different from src.pname in the original package. - inherit version; - hash = "sha256-hoWD3NuKSQXeA6hKm3kD12octZrNnDc28CvHQ7UEfJ4="; - }; - }); - - # ValueError: The operation 'azure.mgmt.devtestlabs.operations#VirtualMachinesOperations.delete' is invalid. - azure-mgmt-devtestlabs = - overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" - "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40="; - # ImportError: cannot import name 'ResourceSku' from 'azure.mgmt.eventgrid.models' azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" From 27735c30748afd32572599cda27496cfdc771c5d Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:25 +0100 Subject: [PATCH 05/14] azure-cli-extensions.managednetworkfabric: 7.0.0 -> 7.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b372bb04afa7..12befe22070d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -638,9 +638,9 @@ }, "managednetworkfabric": { "pname": "managednetworkfabric", - "version": "7.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.0.0-py3-none-any.whl", - "hash": "sha256-I+K24xxpm8DoyNsvqjv9Yi1ewVZeCDCVIizYUB7TKW8=", + "version": "7.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-7.1.0-py3-none-any.whl", + "hash": "sha256-xnwHKrgF+uDN9zcvBizZEh2xan9CdN8Vb/oV5tp7y44=", "description": "Support for managednetworkfabric commands based on 2024-02-15-preview API version" }, "managementpartner": { From 5deb4c3fa41d740ebb4600a6b9bf65be67f3e6df Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:27 +0100 Subject: [PATCH 06/14] azure-cli-extensions.aks-preview: 13.0.0b5 -> 13.0.0b8 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 12befe22070d..91113e3dacde 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "13.0.0b5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b5-py2.py3-none-any.whl", - "hash": "sha256-uB+Vz7PEm28It6DyOEoWJJfWv6wfLC16SV/poGFb4TM=", + "version": "13.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-13.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-vF9KIzydog62S8IsXReYUg/2WjJkCGmQTKc3cd7xYL0=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { From e835570257ead318d3e9680d3361fd3e3d1fc5d9 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:29 +0100 Subject: [PATCH 07/14] azure-cli-extensions.portal: 0.1.3 -> 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 91113e3dacde..f1123770afc9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -806,9 +806,9 @@ }, "portal": { "pname": "portal", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-0.1.3-py3-none-any.whl", - "hash": "sha256-PD6+I/WdtfLShspSz4z7vFmDzoBzYi3hGjXauVgAqZY=", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-1.0.0b1-py3-none-any.whl", + "hash": "sha256-0/pZ1Wo3IUB3hSNxdo6MhVsgf5sdEfO+Tp/dsOGseWk=", "description": "Microsoft Azure Command-Line Tools Portal Extension" }, "powerbidedicated": { From ff287eba8cd4b98fbfdb4718f2e2ca9796984dcd Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:31 +0100 Subject: [PATCH 08/14] azure-cli-extensions.customlocation: update url Signed-off-by: Paul Meyer --- pkgs/by-name/az/azure-cli/extensions-generated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index f1123770afc9..adc8a7f52a61 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -261,7 +261,7 @@ "customlocation": { "pname": "customlocation", "version": "0.1.3", - "url": "https://arcplatformcliextprod.blob.core.windows.net/customlocation/customlocation-0.1.3-py2.py3-none-any.whl", + "url": "https://arcplatformcliextprod.z13.web.core.windows.net/customlocation-0.1.3-py2.py3-none-any.whl", "hash": "sha256-XjZDWxqB3iXnTnDEXCrJ+YBlE4w1BQ8pIQrkDBhITig=", "description": "Microsoft Azure Command-Line Tools Customlocation Extension" }, From 9dbcf35f51b2d48d100eb956ec07d369ae0fa830 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:33 +0100 Subject: [PATCH 09/14] azure-cli-extensions.datamigration: 1.0.0b3 -> 1.0.0b4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index adc8a7f52a61..6118939eef06 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -295,9 +295,9 @@ }, "datamigration": { "pname": "datamigration", - "version": "1.0.0b3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b3-py3-none-any.whl", - "hash": "sha256-pObfLaS8pQZFXgUI8epvYThjUpcjwWgfLWaCs1ZYTgw=", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b4-py3-none-any.whl", + "hash": "sha256-Oumfyx7js8B8NAgSvhM/ED+ltxjrCyicx14D7/Uy+GM=", "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension" }, "dataprotection": { From 61c1feaa2e28443e930d889439df6355bf6dca48 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:35 +0100 Subject: [PATCH 10/14] azure-cli-extensions.image-copy-extension: 1.0.0 -> 1.0.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6118939eef06..69c896a69171 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -533,9 +533,9 @@ }, "image-copy-extension": { "pname": "image-copy-extension", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.0-py2.py3-none-any.whl", - "hash": "sha256-4RO7FHmyQdJd0GY0OqdF9wxYFq5U4sAXYczPFgOUX9g=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-XYMjEh5KX8bdlXXEBhasDLjDZx7DvFK2jDmwTnZPZZQ=", "description": "Support for copying managed vm images between regions" }, "image-gallery": { From a6deba61ec2c9529b01404dabd53462307bbb4f7 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:36 +0100 Subject: [PATCH 11/14] azure-cli-extensions.workloads: 1.1.0b3 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 69c896a69171..0c5923dc7310 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1086,9 +1086,9 @@ }, "workloads": { "pname": "workloads", - "version": "1.1.0b3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-1.1.0b3-py3-none-any.whl", - "hash": "sha256-pzc7LTdmxDs8rq/A7du0kkKXULYsePdndgubC0I2MgY=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-1.1.0-py3-none-any.whl", + "hash": "sha256-hpNEiU4IBe5krQcXEX0oIArfVCXB7Lv6O1sbkrdSAok=", "description": "Microsoft Azure Command-Line Tools Workloads Extension" } } From dd02caf90e63f4d49ade9798bbf98ddece34a9d0 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:38 +0100 Subject: [PATCH 12/14] azure-cli-extensions.cosmosdb-preview: 1.2.0b1 -> 1.2.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 0c5923dc7310..9382ef548c80 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -232,9 +232,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.2.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.2.0b1-py2.py3-none-any.whl", - "hash": "sha256-01tYc3cg2cTa1KDRAOHMoU3bA8heyc4ZdECgbvUPVhE=", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.2.0-py2.py3-none-any.whl", + "hash": "sha256-BNwAiinMYkMedUXdbD2jhlpgBA6Y96CKmabgzolcq2w=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { From 620444d86f84b35d6268ff73600a8cee8c5549c6 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:40 +0100 Subject: [PATCH 13/14] azure-cli-extensions.durabletask: 1.0.0b2 -> 1.0.0b3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9382ef548c80..2f45f1af81b2 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -372,9 +372,9 @@ }, "durabletask": { "pname": "durabletask", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b2-py3-none-any.whl", - "hash": "sha256-llVzI3aKDrxZKUdPijLEmh2gf/BY7Jl9BZYm0g15Iik=", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b3-py3-none-any.whl", + "hash": "sha256-ItQrmkZBSiyR12+Fiez6W7XvEhwwFeSKNxFPvVwdRK8=", "description": "Microsoft Azure Command-Line Tools Durabletask Extension" }, "dynatrace": { From 2e820d0ff65e27e82e4a736f61875cba53f2ad4b Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Tue, 4 Mar 2025 08:27:42 +0100 Subject: [PATCH 14/14] azure-cli-extensions.stack-hci-vm: 1.5.0 -> 1.6.5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2f45f1af81b2..1739e2b3115e 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -953,9 +953,9 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.5.0", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.5.0-py3-none-any.whl", - "hash": "sha256-otixJPDbQp0+eugYFcVEzgAjGrFkDCHdqRUwT3WQ+Pg=", + "version": "1.6.5", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.6.5-py3-none-any.whl", + "hash": "sha256-iXEzjXI9tAJoVWyj/wobX/iw1lHhRdOV4kdYXveRTbk=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": {