1 files changed, 10 insertions, 8 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