From 18c46f641f50b61895b4b91de29216243d4ce3a9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 30 Dec 2021 18:09:02 +1000
Subject: [PATCH] terraform-providers.cloudfoundry: 0.14.2 -> 0.15.0, remove
 separate derivation

---
 .../cloudfoundry/default.nix                  | 29 -------------------
 .../cluster/terraform-providers/default.nix   |  1 -
 .../terraform-providers/providers.json        |  9 ++++++
 3 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix b/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
deleted file mode 100644
index 05d46c079f83..000000000000
--- a/pkgs/applications/networking/cluster/terraform-providers/cloudfoundry/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "terraform-provider-cloudfoundry";
-  version = "0.14.2";
-
-  src = fetchFromGitHub {
-    owner = "cloudfoundry-community";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "12mx87dip6vn10zvkf4rgrd27k708lnl149j9xj7bmb8v9m1082v";
-  };
-
-  vendorSha256 = "0kydjnwzj0fylizvk1vg42zyiy17qhz40z3iwa1r5bb20qkrlz93";
-
-  # needs a running cloudfoundry
-  doCheck = false;
-
-  postInstall = "mv $out/bin/terraform-provider-cloudfoundry{,_v${version}}";
-
-  passthru = { provider-source-address = "registry.terraform.io/cloudfoundry-community/cloudfoundry"; };
-
-  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/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 324994e27f83..dd48cc1b23f1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -53,7 +53,6 @@ let
   # These are the providers that don't fall in line with the default model
   special-providers = {
     # Packages that don't fit the default model
-    cloudfoundry = callPackage ./cloudfoundry { };
     gandi = callPackage ./gandi { };
     hcloud = callPackage ./hcloud { };
     libvirt = callPackage ./libvirt { };
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 29dca5d97081..c7b6c221c887 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -197,6 +197,15 @@
     "vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87",
     "version": "3.6.0"
   },
+  "cloudfoundry": {
+    "owner": "cloudfoundry-community",
+    "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry",
+    "repo": "terraform-provider-cloudfoundry",
+    "rev": "v0.15.0",
+    "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7",
+    "vendorSha256": "19jnaazhdqagfx5wkpvrf0amf7d22kg6hzk0nsg888d0l4x93hna",
+    "version": "0.15.0"
+  },
   "cloudinit": {
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/cloudinit",