From 508182bd81d1d09e11fb6697484ecb25ea654114 Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Sun, 16 Jun 2024 18:11:26 +0200 Subject: [PATCH 1/4] maintainers: add obreitwi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 58679702e21d..ccf56235a522 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15346,6 +15346,12 @@ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; }; + obreitwi = { + email = "oliver@breitwieser.eu"; + github = "obreitwi"; + githubId = 123140; + name = "Oliver Breitwieser"; + }; obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; email = "maintainer@obsidian.systems"; From 1c38fff303902e008a9e4a118049deec4c11bf02 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:38:33 +0200 Subject: [PATCH 2/4] azure-cli-extensions: allow specifying maintainers Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 3336e382bb45..56377be23ab9 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -50,8 +50,8 @@ let changelog = "https://github.com/Azure/azure-cli-extensions/blob/main/src/${pname}/HISTORY.rst"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; - }; - } // (removeAttrs args [ "url" "sha256" "description" ])); + } // args.meta or { }; + } // (removeAttrs args [ "url" "sha256" "description" "meta" ])); extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; } From 249b0c23b8e5b9daebdce7ce15e390846404e682 Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Sun, 16 Jun 2024 18:11:22 +0200 Subject: [PATCH 3/4] azure-cli: propagate build inputs of extensions Signed-off-by: Oliver Breitwieser --- pkgs/tools/admin/azure-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 56377be23ab9..d401801a15ed 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -233,7 +233,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { # pip is required to install extensions locally, but it's not needed if # we're using the default immutable configuration. pip - ]; + ] ++ lib.concatMap (extension: extension.propagatedBuildInputs) withExtensions; postInstall = '' substituteInPlace az.completion.sh \ From 4e798ba01d048d9a6eb131e4c5295aa6e2fda886 Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Sun, 16 Jun 2024 18:11:00 +0200 Subject: [PATCH 4/4] azure-cli-extensions.rdbms-connect: init at 1.0.6 Signed-off-by: Oliver Breitwieser --- .../admin/azure-cli/extensions-manual.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix index 1ae9845f2d45..6e098fb1f3cf 100644 --- a/pkgs/tools/admin/azure-cli/extensions-manual.nix +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -1,4 +1,6 @@ -{ mkAzExtension +{ lib +, mkAzExtension +, mycli , python3Packages }: @@ -9,9 +11,24 @@ 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 + propagatedBuildInputs = with python3Packages; [ distro ]; + }; + + rdbms-connect = mkAzExtension rec { + pname = "rdbms-connect"; + version = "1.0.6"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; + sha256 = "49cbe8d9b7ea07a8974a29ad90247e864ed798bed5f28d0e3a57a4b37f5939e7"; + description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; + propagatedBuildInputs = (with python3Packages; [ + pgcli + psycopg2 + pymysql + setproctitle + ]) ++ [ + mycli ]; + meta.maintainers = with lib.maintainers; [ obreitwi ]; }; # Removed extensions