From e40468c4574905c286cd1f97f28584f12241955d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Dec 2021 18:13:10 +1000 Subject: [PATCH] terraform-providers.hcloud: 1.26.0 -> 1.32.2, remove separate derivation --- .../cluster/terraform-providers/default.nix | 1 - .../terraform-providers/hcloud/default.nix | 32 ------------------- .../terraform-providers/providers.json | 9 ++++++ 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index dd48cc1b23f1..43325fa4265b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -54,7 +54,6 @@ let special-providers = { # Packages that don't fit the default model gandi = callPackage ./gandi { }; - hcloud = callPackage ./hcloud { }; libvirt = callPackage ./libvirt { }; linuxbox = callPackage ./linuxbox { }; lxd = callPackage ./lxd { }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix deleted file mode 100644 index 5d0fcb13f179..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "terraform-provider-hcloud"; - version = "1.26.0"; - - src = fetchFromGitHub { - owner = "hetznercloud"; - repo = pname; - rev = "v${version}"; - sha256 = "04fa3qr65hg1ylq2933ark5q1za6k0a4ky36a6vrw2dcgpr4f9zs"; - }; - - vendorSha256 = "15gcnwylxkgjriqscd4lagmwfssagq0ksrlb2svidw9aahmr7hw0"; - - # Spends an awful time in other test folders, apparently tries to reach - # opencensus and fails. - checkPhase = '' - pushd hcloud - go test -v - popd - ''; - - postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}"; - - meta = with lib; { - homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; - description = "Terraform provider for cloudfoundry"; - license = licenses.mpl20; - maintainers = with maintainers; [ ris ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c7b6c221c887..a0fb0c2f057d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -446,6 +446,15 @@ "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq", "version": "1.6.0" }, + "hcloud": { + "owner": "hetznercloud", + "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", + "repo": "terraform-provider-hcloud", + "rev": "v1.32.2", + "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl", + "version": "1.32.2" + }, "hedvig": { "owner": "terraform-providers", "repo": "terraform-provider-hedvig",