mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-04 19:48:34 +03:00
terraform-providers.google-beta: 3.18.0 -> 3.47.0
This commit is contained in:
parent
0fc33746c6
commit
0fb14ea4d3
@ -39,33 +39,6 @@ let
|
|||||||
passthru = data;
|
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
|
# These providers are managed with the ./update-all script
|
||||||
automated-providers = lib.mapAttrs (_: attrs:
|
automated-providers = lib.mapAttrs (_: attrs:
|
||||||
(if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
|
(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
|
# These are the providers that don't fall in line with the default model
|
||||||
special-providers = {
|
special-providers = {
|
||||||
# Override providers that use Go modules + vendor/ folder
|
|
||||||
google-beta = patchGoModVendor automated-providers.google-beta;
|
|
||||||
|
|
||||||
acme = automated-providers.acme.overrideAttrs (attrs: {
|
acme = automated-providers.acme.overrideAttrs (attrs: {
|
||||||
prePatch = attrs.prePatch or "" + ''
|
prePatch = attrs.prePatch or "" + ''
|
||||||
substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme
|
substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme
|
||||||
|
@ -355,11 +355,13 @@
|
|||||||
"version": "3.47.0"
|
"version": "3.47.0"
|
||||||
},
|
},
|
||||||
"google-beta": {
|
"google-beta": {
|
||||||
"owner": "terraform-providers",
|
"owner": "hashicorp",
|
||||||
|
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||||
"repo": "terraform-provider-google-beta",
|
"repo": "terraform-provider-google-beta",
|
||||||
"rev": "v3.18.0",
|
"rev": "v3.47.0",
|
||||||
"sha256": "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r",
|
"sha256": "1nk0bg2q7dg65rn3j5pkdjv07x0gs7bkv1bpfvlhi9p4fzx9g4by",
|
||||||
"version": "3.18.0"
|
"vendorSha256": "0c2q4d2khsi3v9b659q1kmncnlshv4px6ch99jpcymwqg3xrxda2",
|
||||||
|
"version": "3.47.0"
|
||||||
},
|
},
|
||||||
"grafana": {
|
"grafana": {
|
||||||
"owner": "terraform-providers",
|
"owner": "terraform-providers",
|
||||||
|
Loading…
Reference in New Issue
Block a user