diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 8aeb11e9fbc9..e89af8de6b62 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildGoModule -, buildGo118Module +, buildGo117Module , fetchFromGitHub , callPackage , config @@ -59,13 +59,22 @@ let # These are the providers that don't fall in line with the default model special-providers = { - brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; }; - hcloud = automated-providers.hcloud.override { mkProviderGoModule = buildGo118Module; }; - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + # go-module vendor fails with 1.18 + buildkite = automated-providers.buildkite.override { mkProviderGoModule = buildGo117Module; }; + # go-module vendor fails with 1.18 + checkly = automated-providers.checkly.override { mkProviderGoModule = buildGo117Module; }; + # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); - linode = automated-providers.linode.override { mkProviderGoModule = buildGo118Module; }; - utils = automated-providers.utils.override { mkProviderGoModule = buildGo118Module; }; + # fails to build on x86_64-darwin with 1.18 + lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-darwin with 1.18 + skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; }; + # fails to build on x86_64-{darwin,linux} with 1.18 + tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; }; }; # Put all the providers we not longer support in this list. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34f47973d92f..847a1ad4dc0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35224,7 +35224,9 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { } + callPackage ../applications/networking/cluster/terraform-providers { + buildGoModule = buildGo118Module; + } ); terraforming = callPackage ../applications/networking/cluster/terraforming { };