Merge pull request #263637 from mdarocha/azure-cli-fix-build

azure-cli: fix build failure

Changed files
+17 -6
pkgs
tools
+2 -6
pkgs/tools/admin/azure-cli/default.nix
···
{ lib
-
, stdenv
-
, python3
-
, fetchPypi
+
, callPackage
, fetchFromGitHub
, installShellFiles
}:
···
};
# 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 {
+15
pkgs/tools/admin/azure-cli/python-packages.nix
···
{ stdenv
, python3
, fetchPypi
+
, fetchpatch
, src
, version
}:
···
azure-cli-core = buildAzureCliPackage {
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";