azure-cli: python -> python3 renaming, remove optional py2 deps

To avoid python2 false positives
This commit is contained in:
Jonathan Ringer
2021-12-09 19:33:03 -08:00
committed by Jonathan Ringer
parent 427912ea93
commit 3f01341c8a
2 changed files with 5 additions and 7 deletions
+1 -2
View File
@@ -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 {
@@ -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 \