From f6d23ee78eec3ec9993374b6fde970b85c2e963a Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 19 Feb 2025 18:32:37 +0300 Subject: [PATCH] pulumiPackages: move implementation to pkgs/by-name/pu/pulumi/plugins --- .../pu/pulumi/extra/mk-pulumi-package.nix} | 0 pkgs/by-name/pu/pulumi/package.nix | 3 +-- pkgs/by-name/pu/pulumi/plugins.nix | 16 ++++++++++++++++ .../pu/pulumi/plugins}/pulumi-aws-native.nix | 0 .../pu/pulumi/plugins}/pulumi-azure-native.nix | 0 .../pu/pulumi/plugins}/pulumi-command.nix | 0 .../pu/pulumi/plugins}/pulumi-hcloud.nix | 0 .../pu/pulumi/plugins}/pulumi-language-go.nix | 0 .../pulumi/plugins}/pulumi-language-nodejs.nix | 0 .../pulumi/plugins}/pulumi-language-python.nix | 0 .../pu/pulumi/plugins}/pulumi-random.nix | 0 .../pulumi/plugins}/pulumi-yandex-unofficial.nix | 0 pkgs/tools/admin/pulumi-packages/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 4 +--- 14 files changed, 18 insertions(+), 21 deletions(-) rename pkgs/{tools/admin/pulumi-packages/base.nix => by-name/pu/pulumi/extra/mk-pulumi-package.nix} (100%) create mode 100644 pkgs/by-name/pu/pulumi/plugins.nix rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-aws-native.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-azure-native.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-command.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-hcloud.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-language-go.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-language-nodejs.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-language-python.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-random.nix (100%) rename pkgs/{tools/admin/pulumi-packages => by-name/pu/pulumi/plugins}/pulumi-yandex-unofficial.nix (100%) delete mode 100644 pkgs/tools/admin/pulumi-packages/default.nix diff --git a/pkgs/tools/admin/pulumi-packages/base.nix b/pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/base.nix rename to pkgs/by-name/pu/pulumi/extra/mk-pulumi-package.nix diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix index 662580d68120..9909de24fef2 100644 --- a/pkgs/by-name/pu/pulumi/package.nix +++ b/pkgs/by-name/pu/pulumi/package.nix @@ -10,7 +10,6 @@ callPackage, testers, pulumi, - pulumiPackages, }: buildGoModule rec { pname = "pulumi"; @@ -116,7 +115,7 @@ buildGoModule rec { ''; passthru = { - pkgs = pulumiPackages; + pkgs = callPackage ./plugins.nix { }; withPackages = callPackage ./with-packages.nix { }; tests = { version = testers.testVersion { diff --git a/pkgs/by-name/pu/pulumi/plugins.nix b/pkgs/by-name/pu/pulumi/plugins.nix new file mode 100644 index 000000000000..015dfd0db6f2 --- /dev/null +++ b/pkgs/by-name/pu/pulumi/plugins.nix @@ -0,0 +1,16 @@ +{ callPackage }: +let + mkPulumiPackage = callPackage ./extra/mk-pulumi-package.nix { }; + callPackage' = p: args: callPackage p (args // { inherit mkPulumiPackage; }); +in +{ + pulumi-aws-native = callPackage' ./plugins/pulumi-aws-native.nix { }; + pulumi-azure-native = callPackage' ./plugins/pulumi-azure-native.nix { }; + pulumi-command = callPackage' ./plugins/pulumi-command.nix { }; + pulumi-hcloud = callPackage' ./plugins/pulumi-hcloud.nix { }; + pulumi-language-go = callPackage ./plugins/pulumi-language-go.nix { }; + pulumi-language-nodejs = callPackage ./plugins/pulumi-language-nodejs.nix { }; + pulumi-language-python = callPackage ./plugins/pulumi-language-python.nix { }; + pulumi-random = callPackage' ./plugins/pulumi-random.nix { }; + pulumi-yandex-unofficial = callPackage' ./plugins/pulumi-yandex-unofficial.nix { }; +} diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-aws-native.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-command.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-command.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-command.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-command.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-hcloud.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-hcloud.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-language-go.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-language-go.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-language-go.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-language-nodejs.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-language-nodejs.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-language-python.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-language-python.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-random.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-random.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-random.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-random.nix diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial.nix similarity index 100% rename from pkgs/tools/admin/pulumi-packages/pulumi-yandex-unofficial.nix rename to pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial.nix diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix deleted file mode 100644 index f46dffbfdfe8..000000000000 --- a/pkgs/tools/admin/pulumi-packages/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage }: -let - mkPulumiPackage = callPackage ./base.nix { }; - callPackage' = p: args: callPackage p (args // { inherit mkPulumiPackage; }); -in -{ - pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { }; - pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { }; - pulumi-command = callPackage' ./pulumi-command.nix { }; - pulumi-hcloud = callPackage' ./pulumi-hcloud.nix { }; - pulumi-language-go = callPackage ./pulumi-language-go.nix { }; - pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { }; - pulumi-language-python = callPackage ./pulumi-language-python.nix { }; - pulumi-random = callPackage' ./pulumi-random.nix { }; - pulumi-yandex-unofficial = callPackage' ./pulumi-yandex-unofficial.nix { }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69b69cea9e58..ecd69a09d0a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4511,9 +4511,7 @@ with pkgs; pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { }; - pulumiPackages = recurseIntoAttrs ( - callPackage ../tools/admin/pulumi-packages { } - ); + pulumiPackages = recurseIntoAttrs pulumi.pkgs; pulumi-bin = callPackage ../tools/admin/pulumi-bin { };