diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-29 06:01:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 06:01:18 +0000 |
| commit | 3f274c73286d11961256c11ec3ec940f3b7419e6 (patch) | |
| tree | abff1503abdfbe14f3d82fb469f95e97e0391472 /pkgs/tools/admin | |
| parent | 954eb09381ba2590e02a99cf866e5fb6b893f778 (diff) | |
| parent | 90e85bc7c1a6fc0760a94ace129d3a1c61c3d035 (diff) | |
| download | nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar.gz nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar.bz2 nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar.lz nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar.xz nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.tar.zst nixpkgs-3f274c73286d11961256c11ec3ec940f3b7419e6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/azure-cli/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/admin/azure-cli/python-packages.nix | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4205071c4a3..87231b2277b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv -, python3 -, fetchPypi +, callPackage , fetchFromGitHub , installShellFiles }: @@ -18,9 +16,7 @@ let }; # put packages that needs to be overridden in the py package scope - py = import ./python-packages.nix { - inherit stdenv src version python3 fetchPypi; - }; + py = callPackage ./python-packages.nix { inherit src version; }; 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 d13dd282301..fa7d84e5117 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,6 +1,7 @@ { stdenv , python3 , fetchPypi +, fetchpatch , src , version }: @@ -28,6 +29,20 @@ let pname = "azure-cli-core"; inherit version src; + patches = [ + (fetchpatch { + name = "fix-python311.patch"; + url = "https://github.com/Azure/azure-cli/commit/a5198b578b17de934e15b1c92e369e45323e9658.patch"; + hash = "sha256-qbyKF6Vvtz8QwY78sG7ptTVcbM2IR+phntOKqsrWetE="; + stripLen = 2; + includes = [ + "azure/cli/core/tests/test_command_registration.py" + "azure/cli/core/tests/test_help.py" + "azure/cli/core/tests/test_parser.py" + ]; + }) + ]; + sourceRoot = "${src.name}/src/azure-cli-core"; propagatedBuildInputs = with self; [ |