From db4ef6701d9beee0b69d20c084d46bc98acd1fb5 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Mon, 25 Sep 2023 23:41:21 +0300
Subject: [PATCH] pulumiPackages.pulumi-hcloud: init at 1.20.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also reverts python3Packages.pulumi-hcloud from version 1.21.2 back
to 1.20.4. That is, newer versions require pulumi ≥ 3.142.0 and we have
3.122.0 in Nixpkgs.
---
 .../python-modules/pulumi-hcloud/default.nix  | 48 -------------------
 pkgs/tools/admin/pulumi-packages/default.nix  |  1 +
 .../admin/pulumi-packages/pulumi-hcloud.nix   | 25 ++++++++++
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 27 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pulumi-hcloud/default.nix
 create mode 100644 pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix

diff --git a/pkgs/development/python-modules/pulumi-hcloud/default.nix b/pkgs/development/python-modules/pulumi-hcloud/default.nix
deleted file mode 100644
index fa27194d0ab5..000000000000
--- a/pkgs/development/python-modules/pulumi-hcloud/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-  lib,
-  parver,
-  pulumi,
-  pythonOlder,
-  semver,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "pulumi-hcloud";
-  version = "1.21.1";
-
-  pyproject = true;
-  build-system = [ setuptools ];
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "pulumi";
-    repo = "pulumi-hcloud";
-    tag = "v${version}";
-    hash = "sha256-waeA+qYLj4WFUgNK5/54gfRQivNiIvIp6FoxgpeRjlM=";
-  };
-
-  sourceRoot = "${src.name}/sdk/python";
-
-  # The upstream repository does not contain tests
-  doCheck = false;
-
-  dependencies = [
-    parver
-    pulumi
-    semver
-  ];
-
-  pythonImportsCheck = [ "pulumi_hcloud" ];
-
-  meta = with lib; {
-    description = "Pulumi python hetzner web services provider";
-    homepage = "https://github.com/pulumi/pulumi-hcloud";
-    changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ albertodvp ];
-  };
-}
diff --git a/pkgs/tools/admin/pulumi-packages/default.nix b/pkgs/tools/admin/pulumi-packages/default.nix
index 9e232a1f45bf..f46dffbfdfe8 100644
--- a/pkgs/tools/admin/pulumi-packages/default.nix
+++ b/pkgs/tools/admin/pulumi-packages/default.nix
@@ -7,6 +7,7 @@ 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 { };
diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix b/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix
new file mode 100644
index 000000000000..c55187240826
--- /dev/null
+++ b/pkgs/tools/admin/pulumi-packages/pulumi-hcloud.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  mkPulumiPackage,
+}:
+mkPulumiPackage rec {
+  owner = "pulumi";
+  repo = "pulumi-hcloud";
+  version = "1.20.4";
+  rev = "v${version}";
+  hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo=";
+  vendorHash = "sha256-u3mxaOEXQod1MDFxo85YdOb6Bx/9G5uaa3ykhnmcqCg=";
+  cmdGen = "pulumi-tfgen-hcloud";
+  cmdRes = "pulumi-resource-hcloud";
+  extraLdflags = [
+    "-X=github.com/pulumi/${repo}/provider/pkg/version.Version=v${version}"
+  ];
+  __darwinAllowLocalNetworking = true;
+  meta = with lib; {
+    description = "Hetzner Cloud Pulumi resource package, providing multi-language access to Hetzner Cloud";
+    mainProgram = "pulumi-resource-hcloud";
+    homepage = "https://github.com/pulumi/pulumi-hcloud";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tie ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f7554dd90ff..131547aef0ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1470,7 +1470,7 @@ self: super: with self; {
 
   pulumi-command = pkgs.pulumiPackages.pulumi-command.sdks.python;
 
-  pulumi-hcloud = callPackage ../development/python-modules/pulumi-hcloud { };
+  pulumi-hcloud = pkgs.pulumiPackages.pulumi-hcloud.sdks.python;
 
   pulumi-random = pkgs.pulumiPackages.pulumi-random.sdks.python;