Merge pull request #325950 from superherointj/azure-cli-refactor

azure-cli: move to by-name, nixfmt
NixOS · Jul 10, 2024 · 91e135a · 91e135a
2 parents 0f8eee8 + b918e48
commit 91e135a
Show file tree

Hide file tree

Showing 12 changed files with 706 additions and 593 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -135,3 +135,6 @@ f8c4a98e8e138e21353a2c33b90db3359f539b37
 acd0e3898feb321cb9a71a0fd376f1157d0f4553
 1b28414d2886c57343864326dbb745a634d3e37d
 6afb255d976f85f3359e4929abd6f5149c323a02
+
+# azure-cli: move to by-name, nixfmt #325950
+96cd538b68bd1d0a0a37979356d669abbba32ebc
diff --git a/...ptional-immutable-configuration-dir.patch → ...ptional-immutable-configuration-dir.patch b/...ptional-immutable-configuration-dir.patch → ...ptional-immutable-configuration-dir.patch
diff --git a/pkgs/tools/admin/azure-cli/README.md → pkgs/by-name/az/azure-cli/README.md b/pkgs/tools/admin/azure-cli/README.md → pkgs/by-name/az/azure-cli/README.md
diff --git a/...ls/admin/azure-cli/commit-update-hunks.sh → ...-name/az/azure-cli/commit-update-hunks.sh b/...ls/admin/azure-cli/commit-update-hunks.sh → ...-name/az/azure-cli/commit-update-hunks.sh
diff --git a/.../admin/azure-cli/extensions-generated.nix → ...ame/az/azure-cli/extensions-generated.nix b/.../admin/azure-cli/extensions-generated.nix → ...ame/az/azure-cli/extensions-generated.nix
diff --git a/...ols/admin/azure-cli/extensions-manual.nix → ...y-name/az/azure-cli/extensions-manual.nix b/...ols/admin/azure-cli/extensions-manual.nix → ...y-name/az/azure-cli/extensions-manual.nix
@@ -2,11 +2,12 @@
 #
 # Checkout ./README.md for more information.
 
-{ lib
-, mkAzExtension
-, mycli
-, python3Packages
-, python3
+{
+  lib,
+  mkAzExtension,
+  mycli,
+  python3Packages,
+  python3,
 }:
 
 {
@@ -26,14 +27,14 @@
     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.override { inherit python3; })
-    ];
+    propagatedBuildInputs =
+      (with python3Packages; [
+        pgcli
+        psycopg2
+        pymysql
+        setproctitle
+      ])
+      ++ [ (mycli.override { inherit python3; }) ];
     meta.maintainers = with lib.maintainers; [ obreitwi ];
   };