diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix | 18 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix | 75 |
2 files changed, 65 insertions, 28 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 8a9101cedd6d..81389f39dd38 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,21 +1,23 @@ -{ stdenv, lib, python, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.12.1"; + version = "2.15.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "14m2zjgaszrki34kva23vdsl0nxxifz8r9i54ld3idi8hj3nx0q3"; + sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d"; }; # put packages that needs to be overriden in the py package scope - py = import ./python-packages.nix { inherit stdenv python lib src version; }; + py = import ./python-packages.nix { + inherit stdenv lib src version; + python = python3; + }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pname = "azure-cli"; inherit version src; - disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2 sourceRoot = "source/src/azure-cli"; @@ -23,6 +25,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ + --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" # remove namespace hacks @@ -113,6 +116,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-multiapi-storage azure-storage-blob azure-synapse-accesscontrol + azure-synapse-artifacts azure-synapse-spark colorama cryptography @@ -164,9 +168,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { # almost the entire test suite requires an azure account setup and networking # ensure that the azure namespaces are setup correctly and that azure.cli can be accessed checkPhase = '' - cd azure # avoid finding local copy - ${py.interpreter} -c 'import azure.cli.core; assert "${version}" == azure.cli.core.__version__' - HOME=$TMPDIR ${py.interpreter} -m azure.cli --help + HOME=$TMPDIR $out/bin/az --help > /dev/null ''; # ensure these namespaces are able to be accessed diff --git a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index f13e37d89e97..29787cfb17a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -83,6 +83,11 @@ let ++ lib.optionals isPy3k [ antlr4-python3-runtime ] ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" + ''; + doCheck = stdenv.isLinux; # ignore tests that does network call checkPhase = '' @@ -128,11 +133,14 @@ let azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; + azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" + "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.0.0rc1" "zip" - "0afg5vmyiwqna9rnal9ir2vyg2mykllsf313gd3kn99jl21bgns1"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip" + "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65"; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; @@ -146,11 +154,11 @@ let azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip" - "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" + "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "13.0.0" "zip" - "17ik8lfd74ki57rml2piswcanzbladsqy0s2m9jmvwpdrfpincvz"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip" + "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -188,8 +196,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" - "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip" + "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -206,8 +214,8 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.47.0" "zip" - "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip" + "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -218,6 +226,9 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; + azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip" + "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip" "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; @@ -242,14 +253,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip" - "1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" + "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip" - "0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip" + "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip" "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6"; @@ -263,17 +274,20 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip" - "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip" + "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; + + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" + "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" - "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip" + "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip" - "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz" + "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -304,6 +318,16 @@ let }; }); + azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { + version = "0.3.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + extension = "zip"; + }; + }); + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { version = "0.2.0"; src = super.fetchPypi { @@ -411,6 +435,17 @@ let }; }); + sshtunnel = super.sshtunnel.overridePythonAttrs(oldAttrs: rec { + name = "sshtunnel-${version}"; + version = "0.1.5"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0jcjppp6mdfsqrbfc3ddfxg1ybgvkjv7ri7azwv3j778m36zs4y8"; + }; + }); + websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { version = "0.56.0"; |