From ec6915ff518ff28ea419f798640d6f62839ff06d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:34:27 +0200 Subject: [PATCH 1/2] azure-cli: allow manual packaging of extensions with dependencies Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 93ba305ae894..e376c5ab8161 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -39,8 +39,8 @@ let , url , sha256 , description - }: python3.pkgs.buildPythonPackage { - inherit pname version; + , ... + }@args: python3.pkgs.buildPythonPackage ({ format = "wheel"; src = fetchurl { inherit url sha256; }; meta = with lib; { @@ -51,7 +51,7 @@ let license = lib.licenses.mit; sourceProvenance = [ sourceTypes.fromSource ]; }; - }; + } // (removeAttrs args [ "url" "sha256" "description" ])); extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; }; From d566b7894a3f6fa043f5637e247650d3fe7db218 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:35:22 +0200 Subject: [PATCH 2/2] azure-cli-extensions.azure-devops: init at 1.0.0 Co-authored-by: Oliver Breitwieser Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 4 +++- pkgs/tools/admin/azure-cli/extensions-manual.nix | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/admin/azure-cli/extensions-manual.nix diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index e376c5ab8161..49d3b6ffb139 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -53,7 +53,9 @@ let }; } // (removeAttrs args [ "url" "sha256" "description" ])); - extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; }; + extensions = + callPackages ./extensions-generated.nix { inherit mkAzExtension; } + // callPackages ./extensions-manual.nix { inherit mkAzExtension; }; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix new file mode 100644 index 000000000000..e69888b216b9 --- /dev/null +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -0,0 +1,16 @@ +{ mkAzExtension +, python3Packages +}: + +{ + azure-devops = mkAzExtension rec { + pname = "azure-devops"; + version = "1.0.0"; + url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; + sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + description = "Tools for managing Azure DevOps"; + propagatedBuildInputs = with python3Packages; [ + distro + ]; + }; +}