From 66d044d1171f0086a131a5aebd7b85f70e7b31fa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 20 Jan 2022 04:16:15 +1000 Subject: [PATCH] terraform-providers.gandi: 1.1.1 -> 2.0.0 --- .../cluster/terraform-providers/default.nix | 2 +- .../terraform-providers/gandi/default.nix | 30 ------------------- .../terraform-providers/providers.json | 9 ++++++ 3 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 109951dfdd1c..b25e956b184c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -49,7 +49,7 @@ let special-providers = { # Packages that don't fit the default model - gandi = callPackage ./gandi { }; + # mkisofs needed to create ISOs holding cloud-init data, # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix deleted file mode 100644 index 359adcef5d04..000000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-gandi"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "go-gandi"; - repo = "terraform-provider-gandi"; - rev = "v${version}"; - sha256 = "sha256-PI7cujatzmljyxosGMaqg3Jizee9Py7ffq9gKdehlvo="; - }; - - vendorSha256 = "sha256-dASIvZ3d7xTYMfvqeTcSJt+kaswGNRNqjHDcgoRVxNk="; - deleteVendor = true; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/terraform-provider-gandi{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for the Gandi LiveDNS service."; - homepage = "https://github.com/tiramiseb/terraform-provider-gandi"; - license = licenses.mpl20; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a9e0e1afa49e..cb980ca6f05f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -370,6 +370,15 @@ "vendorSha256": null, "version": "1.13.2" }, + "gandi": { + "owner": "go-gandi", + "provider-source-address": "registry.terraform.io/go-gandi/gandi", + "repo": "terraform-provider-gandi", + "rev": "v2.0.0", + "sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m", + "vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523", + "version": "2.0.0" + }, "github": { "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github",