diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2022-06-06 16:12:32 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-06-06 16:13:23 -0700 |
commit | 40e0a8d9d5e499a9fbe4cd9ffd366c1e85c56ff6 (patch) | |
tree | 711357f04707f56d5ef5d2500aca7827aa8fc3ea /pkgs/tools/admin/azure-cli | |
parent | c055b9b796d532b2ccfa22190551d6c03a728b59 (diff) |
azure-cli: remove blanket python2 compat logic
Diffstat (limited to 'pkgs/tools/admin/azure-cli')
-rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index b65b4a8fbbbb4..ef3c937c0dda7 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -5,9 +5,7 @@ let overrideAzureMgmtPackage = package: version: extension: sha256: # check to make sure overriding is even necessary - if version == package.version then - package - else package.overrideAttrs(oldAttrs: rec { + package.overrideAttrs(oldAttrs: rec { inherit version; src = py.pkgs.fetchPypi { @@ -15,14 +13,14 @@ let inherit version sha256 extension; }; - preBuild = '' - rm -f azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" - ''; + #preBuild = '' + # rm -f azure_bdist_wheel.py + # substituteInPlace setup.cfg \ + # --replace "azure-namespace-package = azure-mgmt-nspkg" "" + #''; - # force PEP420 - pythonNamespaces = [ "azure.mgmt" ]; + ## force PEP420 + #pythonNamespaces = [ "azure.mgmt" ]; }); py = python3.override { |