diff options
author | Timothy Stott <stott.timothy@gmail.com> | 2020-11-15 14:09:54 +0000 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-24 05:42:49 -0800 |
commit | 0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984 (patch) | |
tree | 5780f2172bf50adcc4fe345bd7721dfd9b40802b | |
parent | 0fc33746c63ce1aa8d62b34c65bedbf82e95c779 (diff) | |
download | nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar.gz nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar.bz2 nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar.lz nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar.xz nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.tar.zst nixpkgs-0fb14ea4d36f9cf379ecc9a2ea04c7bf56c54984.zip |
terraform-providers.google-beta: 3.18.0 -> 3.47.0
-rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/terraform-providers/providers.json | 10 |
2 files changed, 6 insertions, 34 deletions
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index e798dbbc41f..b7b6c8ad73b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -39,33 +39,6 @@ let passthru = data; }; - # Google is now using the vendored go modules, which works a bit differently - # and is not 100% compatible with the pre-modules vendored folders. - # - # Instead of switching to goModules which requires a goModSha256, patch the - # goPackage derivation so it can install the top-level. - patchGoModVendor = drv: - drv.overrideAttrs (attrs: { - buildFlags = "-mod=vendor"; - - # override configurePhase to not move the source into GOPATH - configurePhase = '' - export GOPATH=$NIX_BUILD_TOP/go:$GOPATH - export GOCACHE=$TMPDIR/go-cache - export GO111MODULE=on - ''; - - # just build and install into $GOPATH/bin - buildPhase = '' - go install -mod=vendor -v -p 16 . - - runHook postBuild - ''; - - # don't run the tests, they are broken in this setup - doCheck = false; - }); - # These providers are managed with the ./update-all script automated-providers = lib.mapAttrs (_: attrs: (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage) @@ -73,9 +46,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # Override providers that use Go modules + vendor/ folder - google-beta = patchGoModVendor automated-providers.google-beta; - acme = automated-providers.acme.overrideAttrs (attrs: { prePatch = attrs.prePatch or "" + '' substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4cbf25017b3..529eb7d34c8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -355,11 +355,13 @@ "version": "3.47.0" }, "google-beta": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "repo": "terraform-provider-google-beta", - "rev": "v3.18.0", - "sha256": "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r", - "version": "3.18.0" + "rev": "v3.47.0", + "sha256": "1nk0bg2q7dg65rn3j5pkdjv07x0gs7bkv1bpfvlhi9p4fzx9g4by", + "vendorSha256": "0c2q4d2khsi3v9b659q1kmncnlshv4px6ch99jpcymwqg3xrxda2", + "version": "3.47.0" }, "grafana": { "owner": "terraform-providers", |