terraform-providers.ibm: move to update-all script

4 files changed, 14 insertions, 42 deletions

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index 90f7a0f7d8a..fc23869a470 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -440,6 +440,14 @@
       version = "1.14.0";
       sha256  = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z";
     };
+  ibm =
+    {
+      owner   = "IBM-Cloud";
+      repo    = "terraform-provider-ibm";
+      rev     = "v1.4.0";
+      version = "1.4.0";
+      sha256  = "147vl55g6c49ihk8z2hwfq2v7g1yj35id1qfjlz0dxalm7cwa3l6";
+    };
   icinga2 =
     {
       owner   = "terraform-providers";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index c3c44160c1b..be24d21a430 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -50,9 +50,10 @@ let
 
   # These are the providers that don't fall in line with the default model
   special-providers = {
-    # Override the google providers
+    # Override providers that use Go modules + vendor/ folder
     google = patchGoModVendor automated-providers.google;
     google-beta = patchGoModVendor automated-providers.google-beta;
+    ibm = patchGoModVendor automated-providers.ibm;
 
     # providers that were moved to the `hashicorp` organization,
     # but haven't updated their references yet:
@@ -129,12 +130,12 @@ let
       '';
     });
 
-    elasticsearch = callPackage ./elasticsearch {};
+    # Packages that don't fit the default model
+    ansible = callPackage ./ansible {};
     gandi = callPackage ./gandi {};
-    ibm = callPackage ./ibm {};
+    elasticsearch = callPackage ./elasticsearch {};
     libvirt = callPackage ./libvirt {};
     lxd = callPackage ./lxd {};
-    ansible = callPackage ./ansible {};
   };
 in
   automated-providers // special-providers
diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
deleted file mode 100644
index bd667dbc15f..00000000000
--- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-#
-# USAGE:
-# install the following package globally or in nix-shell:
-#
-#   (terraform.withPlugins ( plugins: [ terraform-provider-ibm ]))
-#
-# examples:
-# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples
-#
-
-buildGoPackage rec {
-  pname = "terraform-provider-ibm";
-  version = "0.11.1";
-
-  goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
-  subPackages = [ "./" ];
-
-  src = fetchFromGitHub {
-    owner = "IBM-Cloud";
-    repo = "terraform-provider-ibm";
-    sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv";
-    rev = "v${version}";
-  };
-
-  # Terraform allow checking the provider versions, but this breaks
-  # if the versions are not provided via file paths.
-  postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}";
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/IBM-Cloud/terraform-provider-ibm";
-    description = "Terraform provider is used to manage IBM Cloud resources.";
-    platforms = platforms.all;
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ jensbin ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all
index 89ed5a94f2a..ef5503d03f1 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-all
@@ -112,6 +112,7 @@ cd "$(dirname "$0")"
 
 # individual repos to fetch
 slugs=(
+  IBM-Cloud/terraform-provider-ibm
   ajbosco/terraform-provider-segment
   camptocamp/terraform-provider-pass
   poseidon/terraform-provider-matchbox