git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #129685 from jonringer/bump-azure-cli-july2021
commitc45bbac68ba71efffebe6fc28bbfaa35aa1df90e authorSandro <sandro.jaeckel@gmail.com> dateFri 9 Jul 2021, 02:59 (5 years ago) parent664ebdaf14f710
10 files changed+87−65
compare with master
unifiedsplit
pkgs/development/python-modules/azure-appconfiguration/default.nix+2−2 pkgs/development/python-modules/azure-eventhub/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2 pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix+31 pkgs/development/python-modules/azure-mgmt-signalr/default.nix+2 pkgs/development/python-modules/azure-servicebus/default.nix+2−2 pkgs/development/python-modules/uamqp/default.nix+2−2 pkgs/tools/admin/azure-cli/default.nix+3−2 pkgs/tools/admin/azure-cli/python-packages.nix+39−53 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/azure-appconfiguration/default.nix+2−2
@@ -5,12 +5,12 @@
55
66buildPythonPackage rec {
77 pname = "azure-appconfiguration";
8− version = "1.1.1";
8+ version = "1.2.0";
99
1010 src = fetchPypi {
1111 inherit pname version;
1212 extension = "zip";
13− sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4";
13+ sha256 = "85c9c25612f160897ae212532ec7c19c94b0f4463f4830d0ee08cb2d296df407";
1414 };
1515
1616 propagatedBuildInputs = [
pkgs/development/python-modules/azure-eventhub/default.nix+2−2
@@ -7,12 +7,12 @@
77
88buildPythonPackage rec {
99 pname = "azure-eventhub";
10− version = "5.5.0";
10+ version = "5.6.0";
1111
1212 src = fetchPypi {
1313 inherit pname version;
1414 extension = "zip";
15− sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49";
15+ sha256 = "aa6d9e3e9b8b1a5ad211a828de867b85910720722577a4d51cd5aa6889d1d9e9";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/azure-mgmt-compute/default.nix+2−2
@@ -6,13 +6,13 @@
66}:
77
88buildPythonPackage rec {
9− version = "21.0.0";
9+ version = "22.0.0";
1010 pname = "azure-mgmt-compute";
1111
1212 src = fetchPypi {
1313 inherit pname version;
1414 extension = "zip";
15− sha256 = "9227c3755a70bc377d70e35e1fc6f1fab109dd88974fd2c7129867ccaa10f813";
15+ sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d";
1616 };
1717
1818 propagatedBuildInputs = [
pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib, buildPythonPackage, fetchPypi
2+, azure-common
3+, azure-mgmt-core
4+, msrest
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "azure-mgmt-extendedlocation";
9+ version = "1.0.0b2";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ extension = "zip";
14+ sha256 = "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A=";
15+ };
16+
17+ propagatedBuildInputs = [
18+ azure-common
19+ azure-mgmt-core
20+ msrest
21+ ];
22+
23+ pythonImportsCheck = [ "azure.mgmt.extendedlocation" ];
24+
25+ meta = with lib; {
26+ description = "Microsoft Azure Extendedlocation Management Client Library for Python";
27+ homepage = "https://github.com/Azure/azure-sdk-for-python";
28+ license = licenses.mit;
29+ maintainers = with maintainers; [ jonringer ];
30+ };
31+}
pkgs/development/python-modules/azure-mgmt-signalr/default.nix+2
@@ -4,6 +4,7 @@
44, msrest
55, msrestazure
66, azure-common
7+, azure-mgmt-core
78, azure-mgmt-nspkg
89}:
910
@@ -21,6 +22,7 @@ buildPythonPackage rec {
2122 msrest
2223 msrestazure
2324 azure-common
25+ azure-mgmt-core
2426 azure-mgmt-nspkg
2527 ];
2628
pkgs/development/python-modules/azure-servicebus/default.nix+2−2
@@ -11,12 +11,12 @@
1111
1212buildPythonPackage rec {
1313 pname = "azure-servicebus";
14− version = "7.3.0";
14+ version = "7.3.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
1818 extension = "zip";
19− sha256 = "sha256-NigQxqZjekZjlu6wSrziVwbEBclxfwSK4svd0eHPKr8=";
19+ sha256 = "dc162fc572087cdf53065a2ea9517b002a6702cf382f998d69903d68c16c731e";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/uamqp/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "uamqp";
19− version = "1.4.0";
19+ version = "1.4.1";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "sha256-XzfiLzRK1/DCmnxPW/H+KqnBuCbpYPawS2JnTQq+Vbw=";
23+ sha256 = "sha256-JNGlpu2HvwTGV77WnAQFyvJImHesE2R+ZwMAlhlyk2U=";
2424 };
2525
2626 patches = [
pkgs/tools/admin/azure-cli/default.nix+3−2
@@ -1,7 +1,7 @@
11{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }:
22
33let
4− version = "2.24.2";
4+ version = "2.26.0";
55 srcName = "azure-cli-${version}-src";
66
77 src = fetchFromGitHub {
@@ -9,7 +9,7 @@ let
99 owner = "Azure";
1010 repo = "azure-cli";
1111 rev = "azure-cli-${version}";
12− sha256 = "sha256-4XmwM0/89hacA8ARs5Zq/ahzeqIc9wS18zT/ale+wQ4=";
12+ sha256 = "sha256-O5EL51RRxrp6D82p0Qbo59y/GAkBDhIkIdTxnagKgkY=";
1313 };
1414
1515 # put packages that needs to be overriden in the py package scope
@@ -81,6 +81,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
8181 azure-mgmt-dns
8282 azure-mgmt-eventgrid
8383 azure-mgmt-eventhub
84+ azure-mgmt-extendedlocation
8485 azure-mgmt-hdinsight
8586 azure-mgmt-imagebuilder
8687 azure-mgmt-iotcentral
pkgs/tools/admin/azure-cli/python-packages.nix+39−53
@@ -86,7 +86,7 @@ let
8686
8787 postPatch = ''
8888 substituteInPlace setup.py \
89− --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" \
89+ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \
9090 --replace "cryptography>=3.2,<3.4" "cryptography"
9191 '';
9292
@@ -132,17 +132,20 @@ let
132132 '';
133133 };
134134
135+ azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip"
136+ "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q=";
137+
135138 azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip"
136139 "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0";
137140
138141 azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip"
139142 "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr";
140143
141− azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip"
142− "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83";
144+ azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "15.0.0" "zip"
145+ "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb";
143146
144− azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip"
145− "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
147+ azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip"
148+ "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f";
146149
147150 azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip"
148151 "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
@@ -153,23 +156,23 @@ let
153156 azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip"
154157 "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs=";
155158
156− azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip"
157− "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1";
159+ azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip"
160+ "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza";
158161
159− azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.11.0" "zip"
160− "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
162+ azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip"
163+ "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM=";
161164
162165 azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip"
163166 "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
164167
165− azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "1.0.1" "zip"
168+ azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip"
166169 "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f";
167170
168− azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip"
169− "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx";
171+ azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip"
172+ "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676";
170173
171− azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "20.0.0" "zip"
172− "7920bea2e11d78fa616992813aea470a8fb50eab2e646e032e138f93d53b70e8";
174+ azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "21.0.0" "zip"
175+ "sha256-kifDdVpwvDd9cONeH8bx+rEJ3YiXT9LHEphnzKoQ+BM=";
173176
174177 azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
175178 "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -177,14 +180,11 @@ let
177180 azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip"
178181 "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7";
179182
180− azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "11.2.0" "zip"
181− "sha256-x2YJt+fX0B+YMn7+yYi4t21K518DQQ3kBHn1nCrDSqo=";
182−
183− azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.2.0" "zip"
184− "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998";
183+ azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.0.0" "zip"
184+ "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11";
185185
186− azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.3.0" "zip"
187− "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
186+ azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip"
187+ "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
188188
189189 azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip"
190190 "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA=";
@@ -192,8 +192,8 @@ let
192192 azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
193193 "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
194194
195− azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "3.0.0rc9" "zip"
196− "sha256-txWYthg9QI5OSW6yE5lY+Gpb+/E6x3jb/obfSQuaAcg=";
195+ azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip"
196+ "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510";
197197
198198 azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip"
199199 "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc";
@@ -210,8 +210,8 @@ let
210210 azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
211211 "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r";
212212
213− azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "2.0.0" "zip"
214− "ff3b663e36c961e86fc0cdbd6f9fb9fb863d3e7db9035fe713af7299e809ee5e";
213+ azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "4.0.0" "zip"
214+ "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42";
215215
216216 azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
217217 "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8";
@@ -261,17 +261,17 @@ let
261261 azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip"
262262 "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3";
263263
264− azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.4.0" "zip"
265− "09n12ligh301z4xwixl50n8f1rgd2k6lpsxqzr6n6jvgkpdds0v5";
264+ azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip"
265+ "sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw=";
266266
267− azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.26.0" "zip"
268− "sha256-tmsxhHt6mRWNOXDebckZSXt4L8+757NRKSDu6wVMqRE=";
267+ azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.29.0" "zip"
268+ "sha256-a8epWPoGI4SA01DkjToaHmTx8lSPgwMB7dutI/zaoAA=";
269269
270270 azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
271271 "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
272272
273− azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.6.0" "zip"
274− "sha256-+By1KyIHdKq5P/zyW9wX4D/YS2kWg2ZAeJ+G+/Y2uYQ=";
273+ azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip"
274+ "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8";
275275
276276 azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip"
277277 "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
@@ -288,17 +288,17 @@ let
288288 azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip"
289289 "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907";
290290
291− azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc17" "zip"
292− "sha256-M6lenj1rVEJZ+EJyBXkqokFfr1e5sqRgcAbUc0W0svo=";
291+ azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.0.0" "zip"
292+ "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756";
293293
294294 azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip"
295295 "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82";
296296
297− azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip"
298− "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r";
297+ azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip"
298+ "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b";
299299
300− azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "0.1.1" "zip"
301− "16raxr5naszrxmgbfhsvh7rqcph5cx6x3f480790m79ykvmjj0pi";
300+ azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip"
301+ "c287a2c7def4de19f92c0c31ba02867fac6f5b8df71b5dbdab19288bb455fc5b";
302302
303303 azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip"
304304 "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m";
@@ -312,8 +312,8 @@ let
312312 azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip"
313313 "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap";
314314
315− azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.2.0" "zip"
316− "sha256-Myxg3G0+OAk/bh4k5TOEGGJuyEBtYA2edNlbIXnWE4M=";
315+ azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip"
316+ "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000";
317317
318318 azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.6.2" "tar.gz"
319319 "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
@@ -458,20 +458,6 @@ let
458458 };
459459 });
460460
461− pyjwt = super.pyjwt.overridePythonAttrs(oldAttrs: rec {
462− version = "1.7.1";
463−
464− src = super.fetchPypi {
465− inherit (oldAttrs) pname;
466− inherit version;
467− sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
468− };
469−
470− # new cryptography returns slightly different values than what's expected
471− # this gets tested in azure-cli-core, so not absolutely necessary to run tests here
472− doCheck = false;
473− });
474−
475461 PyGithub = super.PyGithub.overridePythonAttrs(oldAttrs: rec {
476462 version = "1.38";
477463
pkgs/top-level/python-packages.nix+2
@@ -823,6 +823,8 @@ in {
823823
824824 azure-mgmt-eventhub = callPackage ../development/python-modules/azure-mgmt-eventhub { };
825825
826+ azure-mgmt-extendedlocation = callPackage ../development/python-modules/azure-mgmt-extendedlocation { };
827+
826828 azure-mgmt-hanaonazure = callPackage ../development/python-modules/azure-mgmt-hanaonazure { };
827829
828830 azure-mgmt-hdinsight = callPackage ../development/python-modules/azure-mgmt-hdinsight { };