diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-10 06:01:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 06:01:17 +0000 |
| commit | b2a2a5759e699cf227288bba886f27fa1c09836e (patch) | |
| tree | f0a99a58b099289daa188a311a5be9faa2d369d6 /pkgs/tools/admin/azure-cli | |
| parent | 718872a83978a9e4cd9544e500d456e8ebe2919b (diff) | |
| parent | e8db6b459b365211a79cda130df34ded3329275f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin/azure-cli')
| -rw-r--r-- | pkgs/tools/admin/azure-cli/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4034ac315642b..728fcf6eec5b4 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -14,8 +14,7 @@ let # put packages that needs to be overriden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version; - python = python3; + inherit stdenv lib src version python3; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 7e2970861c17d..42794599cdbac 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python, lib, src, version }: +{ stdenv, python3, lib, src, version }: let buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage attrs; @@ -25,7 +25,7 @@ let pythonNamespaces = [ "azure.mgmt" ]; }); - py = python.override { + py = python3.override { packageOverrides = self: super: { inherit buildAzureCliPackage; @@ -38,6 +38,7 @@ let propagatedBuildInputs = with self; [ adal + antlr4-python3-runtime argcomplete azure-common azure-cli-telemetry @@ -63,9 +64,7 @@ let requests six tabulate - ] - ++ lib.optionals isPy3k [ antlr4-python3-runtime ] - ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + ]; postPatch = '' substituteInPlace setup.py \ |