@@ -1,6 +1,5 @@
11{ lib
22, buildGoModule
3−, buildGoPackage
43, fetchFromGitHub
54, callPackage
65, config
@@ -11,13 +10,12 @@ let
1110 buildWithGoModule = data:
1211 buildGoModule {
1312 pname = data.repo;
14− version = data.version;
13+ inherit (data) vendorSha256 version;
1514 subPackages = [ "." ];
1615 doCheck = false;
1716 src = fetchFromGitHub {
1817 inherit (data) owner repo rev sha256;
1918 };
20− vendorSha256 = data.vendorSha256 or null;
2119 deleteVendor = data.deleteVendor or false;
2220 proxyVendor = data.proxyVendor or false;
2321
@@ -27,25 +25,9 @@ let
2725 passthru = data;
2826 };
2927
30− buildWithGoPackage = data:
31− buildGoPackage {
32− pname = data.repo;
33− version = data.version;
34− goPackagePath = "github.com/${data.owner}/${data.repo}";
35− subPackages = [ "." ];
36− doCheck = false;
37− src = fetchFromGitHub {
38− inherit (data) owner repo rev sha256;
39− };
40− # Terraform allow checking the provider versions, but this breaks
41− # if the versions are not provided via file paths.
42− postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}";
43− passthru = data;
44− };
45−
4628 # Our generic constructor to build new providers
4729 mkProvider = attrs:
48− (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage)
30+ (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else throw /* added 2022/01 */ "vendorSha256 missing: please use `buildGoModule`")
4931 attrs;
5032
5133 # These providers are managed with the ./update-all script