azure-cli: 2.75.0 -> 2.77.0

+51 -13
+15 -13
pkgs/by-name/az/azure-cli/package.nix
··· 26 26 }: 27 27 28 28 let 29 - version = "2.75.0"; 29 + version = "2.77.0"; 30 30 31 31 src = fetchFromGitHub { 32 32 name = "azure-cli-${version}-src"; 33 33 owner = "Azure"; 34 34 repo = "azure-cli"; 35 35 tag = "azure-cli-${version}"; 36 - hash = "sha256-u6umAqRUfiACt23mxTtfosLdxKSPvDVJMkVjPCtxr24="; 36 + hash = "sha256-+AvfZIeGxQ+27gpg1y3fMMN7fBP4ATXr7By+dJpux3k="; 37 37 }; 38 38 39 39 # put packages that needs to be overridden in the py package scope ··· 154 154 ]; 155 155 156 156 # Dependencies from: 157 - # https://github.com/Azure/azure-cli/blob/azure-cli-2.62.0/src/azure-cli/setup.py#L52 157 + # https://github.com/Azure/azure-cli/blob/azure-cli-2.77.0/src/azure-cli/setup.py#L52 158 158 # Please, keep ordered by upstream file order. It facilitates reviews. 159 159 propagatedBuildInputs = 160 160 with py.pkgs; ··· 166 166 azure-cosmos 167 167 azure-data-tables 168 168 azure-datalake-store 169 - azure-graphrbac 170 169 azure-keyvault-administration 171 170 azure-keyvault-certificates 172 171 azure-keyvault-keys ··· 189 188 azure-mgmt-containerregistry 190 189 azure-mgmt-containerservice 191 190 azure-mgmt-cosmosdb 192 - azure-mgmt-databoxedge 193 191 azure-mgmt-datalake-store 194 192 azure-mgmt-datamigration 195 - azure-mgmt-dns 196 193 azure-mgmt-eventgrid 197 194 azure-mgmt-eventhub 198 195 azure-mgmt-extendedlocation ··· 203 200 azure-mgmt-iothubprovisioningservices 204 201 azure-mgmt-keyvault 205 202 azure-mgmt-loganalytics 206 - azure-mgmt-managedservices 207 203 azure-mgmt-managementgroups 208 204 azure-mgmt-maps 209 205 azure-mgmt-marketplaceordering 210 206 azure-mgmt-media 211 207 azure-mgmt-monitor 212 208 azure-mgmt-msi 213 - azure-mgmt-mysqlflexibleservers 214 209 azure-mgmt-netapp 215 210 azure-mgmt-policyinsights 216 211 azure-mgmt-postgresqlflexibleservers 217 212 azure-mgmt-privatedns 218 213 azure-mgmt-rdbms 214 + azure-mgmt-mysqlflexibleservers 219 215 azure-mgmt-recoveryservicesbackup 220 216 azure-mgmt-recoveryservices 221 - azure-mgmt-redis 222 217 azure-mgmt-redhatopenshift 223 - azure-mgmt-resource 218 + azure-mgmt-redis 219 + azure-mgmt-resource-all 220 + # Added through azure-mgmt-resource-all package 221 + # azure-mgmt-resource 222 + # azure-mgmt-resource-deployments 223 + # azure-mgmt-resource-deploymentscripts 224 + # azure-mgmt-resource-deploymentstacks 225 + # azure-mgmt-resource-templatespecs 224 226 azure-mgmt-search 225 227 azure-mgmt-security 226 228 azure-mgmt-servicebus ··· 250 252 javaproperties 251 253 jsondiff 252 254 packaging 255 + paramiko 253 256 pycomposefile 254 257 pygithub 255 258 pynacl ··· 324 327 "azure.cli.telemetry" 325 328 "azure.cosmos" 326 329 "azure.datalake.store" 327 - "azure.graphrbac" 328 330 "azure.keyvault" 329 331 "azure.mgmt.advisor" 330 332 "azure.mgmt.apimanagement" ··· 344 346 "azure.mgmt.containerservice" 345 347 "azure.mgmt.cosmosdb" 346 348 "azure.mgmt.datamigration" 347 - "azure.mgmt.dns" 348 349 "azure.mgmt.eventgrid" 349 350 "azure.mgmt.eventhub" 350 351 "azure.mgmt.hdinsight" ··· 354 355 "azure.mgmt.iothubprovisioningservices" 355 356 "azure.mgmt.keyvault" 356 357 "azure.mgmt.loganalytics" 357 - "azure.mgmt.managedservices" 358 358 "azure.mgmt.managementgroups" 359 359 "azure.mgmt.maps" 360 360 "azure.mgmt.marketplaceordering" ··· 369 369 "azure.mgmt.recoveryservicesbackup" 370 370 "azure.mgmt.redis" 371 371 "azure.mgmt.resource" 372 + "azure.mgmt.resource.deployments" 373 + "azure.mgmt.resource.deployments.models" 372 374 "azure.mgmt.search" 373 375 "azure.mgmt.security" 374 376 "azure.mgmt.servicebus"
+36
pkgs/by-name/az/azure-cli/python-packages.nix
··· 1 1 { 2 + lib, 2 3 stdenv, 3 4 python3, 4 5 fetchPypi, ··· 190 191 azure-mgmt-redhatopenshift = 191 192 overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.5.0" "tar.gz" 192 193 "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc="; 194 + 195 + # azure.mgmt.resource will shadow the other azure.mgmt.resource.* packages unless we merge them together 196 + azure-mgmt-resource-all = py.pkgs.buildPythonPackage { 197 + pname = "azure-mgmt-resource-all"; 198 + inherit version; 199 + 200 + format = "other"; # we're not building from sdist/wheel 201 + 202 + src = py.pkgs.azure-mgmt-resource.src; 203 + 204 + # No real build, just symlink all site-packages into one dir 205 + installPhase = '' 206 + runHook preInstall 207 + 208 + mkdir -p $out/${py.sitePackages} 209 + for pkg in ${ 210 + lib.concatStringsSep " " ( 211 + map (p: "${p}") [ 212 + py.pkgs.azure-mgmt-resource 213 + py.pkgs.azure-mgmt-resource-deployments 214 + py.pkgs.azure-mgmt-resource-deploymentscripts 215 + py.pkgs.azure-mgmt-resource-deploymentstacks 216 + py.pkgs.azure-mgmt-resource-templatespecs 217 + ] 218 + ) 219 + }; do 220 + # Copy recursively, keep symlinks, skip duplicates silently 221 + cp -rs --no-preserve=mode "$pkg/${py.sitePackages}/." "$out/${py.sitePackages}/" || true 222 + done 223 + 224 + runHook postInstall 225 + ''; 226 + 227 + doCheck = false; 228 + }; 193 229 194 230 # ImportError: cannot import name 'IPRule' from 'azure.mgmt.signalr.models' 195 231 azure-mgmt-signalr =