From b2071f5035891b17d7d6a62de6a64af3897ade16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 10 Feb 2021 23:59:44 +0100 Subject: [PATCH] terraform-providers.elasticsearch: 0.7.0 -> 1.5.2 Define provider in `providers.json`. Remove custom build for terraform provider. --- .../cluster/terraform-providers/default.nix | 1 - .../elasticsearch/default.nix | 29 ------------------- .../terraform-providers/providers.json | 9 ++++++ 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index cbabdcac72f..a08a3d336bf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -56,7 +56,6 @@ let # Packages that don't fit the default model ansible = callPackage ./ansible {}; cloudfoundry = callPackage ./cloudfoundry {}; - elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; hcloud = callPackage ./hcloud {}; keycloak = callPackage ./keycloak {}; diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix deleted file mode 100644 index 6ae781046df..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-elasticsearch"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "phillbaker"; - repo = "terraform-provider-elasticsearch"; - rev = "v${version}"; - sha256 = "0ci9gcn9ijdbx25wa99iy0b3sl7akqa7b6gi9wnnl1dawpqznj7v"; - }; - - vendorSha256 = "1rdvyypdl3fk6af66gfjhyl271cnlx5xgrl1w68sc6sbvq00bqkd"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/terraform-provider-elasticsearch{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for elasticsearch"; - homepage = "https://github.com/phillbaker/terraform-provider-elasticsearch"; - license = licenses.mpl20; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 26304bf0374..f65ce2fb856 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -287,6 +287,15 @@ "sha256": "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48", "version": "1.2.0" }, + "elasticsearch": { + "owner": "phillbaker", + "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", + "repo": "terraform-provider-elasticsearch", + "rev": "v1.5.2", + "sha256": "1yfmlqab2jb679gbns04sdcjfihzsa0dfp7blhfk3v5zhgv1g7ys", + "vendorSha256": "15m9aqb2lqjv6g3k46zyha2m118wpbjrh4ap1bfps0fcxn20qvr5", + "version": "1.5.2" + }, "exoscale": { "owner": "terraform-providers", "repo": "terraform-provider-exoscale",