@@ -39,33 +39,6 @@ let
3939 passthru = data;
4040 };
4141
42− # Google is now using the vendored go modules, which works a bit differently
43− # and is not 100% compatible with the pre-modules vendored folders.
44− #
45− # Instead of switching to goModules which requires a goModSha256, patch the
46− # goPackage derivation so it can install the top-level.
47− patchGoModVendor = drv:
48− drv.overrideAttrs (attrs: {
49− buildFlags = "-mod=vendor";
50−
51− # override configurePhase to not move the source into GOPATH
52− configurePhase = ''
53− export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
54− export GOCACHE=$TMPDIR/go-cache
55− export GO111MODULE=on
56− '';
57−
58− # just build and install into $GOPATH/bin
59− buildPhase = ''
60− go install -mod=vendor -v -p 16 .
61−
62− runHook postBuild
63− '';
64−
65− # don't run the tests, they are broken in this setup
66− doCheck = false;
67− });
68−
6942 # These providers are managed with the ./update-all script
7043 automated-providers = lib.mapAttrs (_: attrs:
7144 (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
@@ -73,9 +46,6 @@ let
7346
7447 # These are the providers that don't fall in line with the default model
7548 special-providers = {
76− # Override providers that use Go modules + vendor/ folder
77− google-beta = patchGoModVendor automated-providers.google-beta;
78−
7949 acme = automated-providers.acme.overrideAttrs (attrs: {
8050 prePatch = attrs.prePatch or "" + ''
8151 substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme