From 8614c303a395f0072220b0001f052724c6a53916 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Sun, 5 Dec 2021 14:01:14 -0500
Subject: [PATCH] rekahsoft-gnu: terraform: Install all terraform providers
 with a version suffix

---
 rekahsoft-gnu/packages/terraform.scm | 986 ++++++++++++++-------------
 1 file changed, 502 insertions(+), 484 deletions(-)

diff --git a/rekahsoft-gnu/packages/terraform.scm b/rekahsoft-gnu/packages/terraform.scm
index ee15581..9ec2e85 100644
--- a/rekahsoft-gnu/packages/terraform.scm
+++ b/rekahsoft-gnu/packages/terraform.scm
@@ -172,530 +172,548 @@ instead of @command{terraform-MAJOR.MINOR}.")))
            (copy-recursively original-path install-path)
            (delete-file-recursively original-path))))))
 
-(define-public terraform-provider-aws
-  (package
-    (name "terraform-provider-aws")
-    (version "2.14.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-aws")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "12z0ggbwwgv44a7wh3y9aq425hlax8hyrx4mhx2wyydfdhqs11h1"))))
-    (build-system go-build-system)
+(define (make-terraform-provider package)
+  (package/inherit package
     (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-aws"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "@command{Terraform} AWS provider")
-    (description
-     "Terraform AWS provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-aws")
-    (license license:mpl2.0)))
+     (substitute-keyword-arguments (package-arguments package)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-after 'install 'change-out
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (bin (string-append out "/bin"))
+                      (tf-provider-name ,(package-name package))
+                      (tf-provider-name+version (string-append tf-provider-name "_" ,(package-version package)))
+                      (libexec (string-append out "/libexec/terraform")))
+                 (mkdir-p libexec)
+                 (rename-file (string-append bin "/" tf-provider-name)
+                              (string-append libexec "/" tf-provider-name+version))
+                 (delete-file-recursively bin))))))))))
+
+(define-public terraform-provider-aws
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-aws")
+     (version "2.70.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-aws")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1swmkyi8yv1rpkzn283lm9kqjyzscvjfzm8smn0sxcniwx7002js"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-aws"
+        #:install-source? #f))
+     (synopsis "@command{Terraform} AWS provider")
+     (description
+      "Terraform AWS provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-aws")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-template
-  (package
-    (name "terraform-provider-template")
-    (version "2.2.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-template")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-template"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "@command{Terraform} AWS provider")
-    (description
-     "Terraform template provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-template")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-template")
+     (version "2.2.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-template")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-template"
+        #:install-source? #f))
+     (synopsis "@command{Terraform} AWS provider")
+     (description
+      "Terraform template provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-template")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-google
-  (package
-    (name "terraform-provider-google")
-    (version "2.8.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-google")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-google"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Google Cloud Platform provider ")
-    (description
-     "Terraform Google Cloud Platform provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-google")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-google")
+     (version "2.8.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-google")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-google"
+        #:install-source? #f))
+     (synopsis "Terraform Google Cloud Platform provider ")
+     (description
+      "Terraform Google Cloud Platform provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-google")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-kubernetes
-  (package
-    (name "terraform-provider-kubernetes")
-    (version "1.7.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-kubernetes")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fah2310hic2svjfya3051sv8sp5gwgrfc1y2ggdn66hjz0x6ir3"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-kubernetes"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Kubernetes provider ")
-    (description
-     "Terraform Kubernetes provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-kubernetes")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-kubernetes")
+     (version "1.7.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-kubernetes")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0fah2310hic2svjfya3051sv8sp5gwgrfc1y2ggdn66hjz0x6ir3"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-kubernetes"
+        #:install-source? #f))
+     (synopsis "Terraform Kubernetes provider ")
+     (description
+      "Terraform Kubernetes provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-kubernetes")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-azurerm
-  (package
-    (name "terraform-provider-azurerm")
-    (version "1.30.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-azurerm")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-azurerm"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Azure Resource Manager provider")
-    (description
-     "Terraform Azure Resource Manager provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-azurerm")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-azurerm")
+     (version "1.30.1")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-azurerm")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-azurerm"
+        #:install-source? #f))
+     (synopsis "Terraform Azure Resource Manager provider")
+     (description
+      "Terraform Azure Resource Manager provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-azurerm")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-alicloud
-  (package
-    (name "terraform-provider-alicloud")
-    (version "1.46.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-alicloud")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0cndsc0k7mk5xmaakszbl680igxfvxzlcnrfr07qz6bk796p9sfp"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-alicloud"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Alicloud provider")
-    (description
-     "Terraform Alicloud provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-alicloud")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-alicloud")
+     (version "1.46.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-alicloud")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0cndsc0k7mk5xmaakszbl680igxfvxzlcnrfr07qz6bk796p9sfp"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-alicloud"
+        #:install-source? #f))
+     (synopsis "Terraform Alicloud provider")
+     (description
+      "Terraform Alicloud provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-alicloud")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-vsphere
-  (package
-    (name "terraform-provider-vsphere")
-    (version "1.11.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-vsphere")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "02qkm8n0z8v8xfjkvy5nkjc4p37xqp5xsds10b3b060vb5l6yfg4"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-vsphere"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Vsphere provider")
-    (description
-     "Terraform Vsphere provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-vsphere")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-vsphere")
+     (version "1.11.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-vsphere")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "02qkm8n0z8v8xfjkvy5nkjc4p37xqp5xsds10b3b060vb5l6yfg4"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-vsphere"
+        #:install-source? #f))
+     (synopsis "Terraform Vsphere provider")
+     (description
+      "Terraform Vsphere provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-vsphere")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-cloudflare
-  (package
-    (name "terraform-provider-cloudflare")
-    (version "1.15.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-cloudflare")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-cloudflare"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Cloudflare provider")
-    (description
-     "Terraform Cloudflare provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-cloudflare")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-cloudflare")
+     (version "1.15.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-cloudflare")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-cloudflare"
+        #:install-source? #f))
+     (synopsis "Terraform Cloudflare provider")
+     (description
+      "Terraform Cloudflare provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-cloudflare")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-vault
-  (package
-    (name "terraform-provider-vault")
-    (version "1.9.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-vault")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "19ckfm89877s7jp8vssph9mdjr3srq4m6kc2zn2ky979775bi5lw"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-vault"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Vault provider")
-    (description
-     "Terraform Vault provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-vault")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-vault")
+     (version "1.9.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-vault")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "19ckfm89877s7jp8vssph9mdjr3srq4m6kc2zn2ky979775bi5lw"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-vault"
+        #:install-source? #f))
+     (synopsis "Terraform Vault provider")
+     (description
+      "Terraform Vault provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-vault")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-gitlab
-  (package
-    (name "terraform-provider-gitlab")
-    (version "1.2.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-gitlab")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-gitlab"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Gitlab provider")
-    (description
-     "Terraform Gitlab provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-gitlab")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-gitlab")
+     (version "1.2.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-gitlab")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-gitlab"
+        #:install-source? #f))
+     (synopsis "Terraform Gitlab provider")
+     (description
+      "Terraform Gitlab provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-gitlab")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-github
-  (package
-    (name "terraform-provider-github")
-    (version "2.1.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-github")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-github"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Github provider")
-    (description
-     "Terraform Github provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-github")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-github")
+     (version "2.1.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-github")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-github"
+        #:install-source? #f))
+     (synopsis "Terraform Github provider")
+     (description
+      "Terraform Github provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-github")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-digitalocean
-  (package
-    (name "terraform-provider-digitalocean")
-    (version "1.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-digitalocean")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1x55clpy3i2jrnmdwlya82vd3aiyvrzpx5y57xjs29x232cygw7r"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-digitalocean"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Digitalocean provider")
-    (description
-     "Terraform Digitalocean provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-digitalocean")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-digitalocean")
+     (version "1.4.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-digitalocean")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1x55clpy3i2jrnmdwlya82vd3aiyvrzpx5y57xjs29x232cygw7r"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-digitalocean"
+        #:install-source? #f))
+     (synopsis "Terraform Digitalocean provider")
+     (description
+      "Terraform Digitalocean provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-digitalocean")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-helm
-  (package
-    (name "terraform-provider-helm")
-    (version "0.9.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-helm")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1bni05ski94w3ihhf0jp3mk8dzkbm9jlgv6xb23403ppcbgy7s9d"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-helm"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Helm provider")
-    (description
-     "Terraform Helm provider.")
-    (home-page "https://helm.com/terraform-providers/terraform-provider-helm")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-helm")
+     (version "0.9.1")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-helm")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1bni05ski94w3ihhf0jp3mk8dzkbm9jlgv6xb23403ppcbgy7s9d"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-helm"
+        #:install-source? #f))
+     (synopsis "Terraform Helm provider")
+     (description
+      "Terraform Helm provider.")
+     (home-page "https://helm.com/terraform-providers/terraform-provider-helm")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-linode
-  (package
-    (name "terraform-provider-linode")
-    (version "1.6.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-linode")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0i2x0jd26qanziihlc38s7rxiab66ld2s5gz18rrmrbwhcl95fwj"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-linode"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform Linode provider")
-    (description
-     "Terraform Linode provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-linode")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-linode")
+     (version "1.6.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-linode")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0i2x0jd26qanziihlc38s7rxiab66ld2s5gz18rrmrbwhcl95fwj"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-linode"
+        #:install-source? #f))
+     (synopsis "Terraform Linode provider")
+     (description
+      "Terraform Linode provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-linode")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-random
-  (package
-    (name "terraform-provider-random")
-    (version "2.1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-random")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-random"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform random provider")
-    (description
-     "Terraform Random provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-random")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-random")
+     (version "2.1.2")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-random")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-random"
+        #:install-source? #f))
+     (synopsis "Terraform random provider")
+     (description
+      "Terraform Random provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-random")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-null
-  (package
-    (name "terraform-provider-null")
-    (version "2.1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-null")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-null"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform null provider")
-    (description
-     "Terraform null provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-null")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-null")
+     (version "2.1.2")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-null")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-null"
+        #:install-source? #f))
+     (synopsis "Terraform null provider")
+     (description
+      "Terraform null provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-null")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-heroku
-  (package
-    (name "terraform-provider-heroku")
-    (version "2.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-heroku")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-heroku"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform heroku provider")
-    (description
-     "Terraform Heroku provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-heroku")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-heroku")
+     (version "2.0.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-heroku")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-heroku"
+        #:install-source? #f))
+     (synopsis "Terraform heroku provider")
+     (description
+      "Terraform Heroku provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-heroku")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-nomad
-  (package
-    (name "terraform-provider-nomad")
-    (version "1.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-nomad")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-nomad"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform nomad provider")
-    (description
-     "Terraform Nomad provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-nomad")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-nomad")
+     (version "1.4.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-nomad")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-nomad"
+        #:install-source? #f))
+     (synopsis "Terraform nomad provider")
+     (description
+      "Terraform Nomad provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-nomad")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-postgresql
-  (package
-    (name "terraform-provider-postgresql")
-    (version "0.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-postgresql")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-postgresql"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform postgresql provider")
-    (description
-     "Terraform Postgresql provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-postgresql")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-postgresql")
+     (version "0.4.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-postgresql")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-postgresql"
+        #:install-source? #f))
+     (synopsis "Terraform postgresql provider")
+     (description
+      "Terraform Postgresql provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-postgresql")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-grafana
-  (package
-    (name "terraform-provider-grafana")
-    (version "1.4.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-grafana")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-grafana"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform grafana provider")
-    (description
-     "Terraform Grafana provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-grafana")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-grafana")
+     (version "1.4.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-grafana")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-grafana"
+        #:install-source? #f))
+     (synopsis "Terraform grafana provider")
+     (description
+      "Terraform Grafana provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-grafana")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-docker
-  (package
-    (name "terraform-provider-docker")
-    (version "1.2.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-docker")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-docker"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform docker provider")
-    (description
-     "Terraform Docker provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-docker")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-docker")
+     (version "1.2.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-docker")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-docker"
+        #:install-source? #f))
+     (synopsis "Terraform docker provider")
+     (description
+      "Terraform Docker provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-docker")
+     (license license:mpl2.0))))
 
 (define-public terraform-provider-openstack
-  (package
-    (name "terraform-provider-openstack")
-    (version "1.19.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/terraform-providers/terraform-provider-openstack")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/terraform-providers/terraform-provider-openstack"
-       #:install-source? #f
-       #:phases ,terraform-provider-phases))
-    (synopsis "Terraform openstack provider")
-    (description
-     "Terraform Openstack provider.")
-    (home-page "https://github.com/terraform-providers/terraform-provider-openstack")
-    (license license:mpl2.0)))
+  (make-terraform-provider
+   (package
+     (name "terraform-provider-openstack")
+     (version "1.19.0")
+     (source (origin
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/terraform-providers/terraform-provider-openstack")
+                     (commit (string-append "v" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9"))))
+     (build-system go-build-system)
+     (arguments
+      `(#:import-path "github.com/terraform-providers/terraform-provider-openstack"
+        #:install-source? #f))
+     (synopsis "Terraform openstack provider")
+     (description
+      "Terraform Openstack provider.")
+     (home-page "https://github.com/terraform-providers/terraform-provider-openstack")
+     (license license:mpl2.0))))