buildGo117{Package,Module}: enable

Required to bump Grafana to 8.2.3 in order to fix CVE-2021-41174.
Building it works fine on both `x86_64-linux` and `aarch64-linux`, so
the only blocker are incompatible hashes.

As long as `buildGoModule` doesn't default to Go 1.17 without a
coordinated update, this should be OK.
This commit is contained in:
Maximilian Bosch
2021-11-06 23:09:12 +01:00
parent c0e4e23429
commit ee9649b2a8
+8 -8
View File
@@ -20237,10 +20237,10 @@ with pkgs;
# across different go versions and/or platforms:
# https://github.com/NixOS/nixpkgs/issues/144667
#
# do not uncomment this without approval from the go CODEOWNERS
#buildGo117Package = callPackage ../development/go-packages/generic {
# go = buildPackages.go_1_17;
#};
# That's why `buildGoPackage != buildGo117Package`.
buildGo117Package = callPackage ../development/go-packages/generic {
go = buildPackages.go_1_17;
};
buildGoPackage = buildGo116Package;
@@ -20254,10 +20254,10 @@ with pkgs;
# across different go versions and/or platforms:
# https://github.com/NixOS/nixpkgs/issues/144667
#
# do not uncomment this without approval from the go CODEOWNERS
#buildGo117Module = callPackage ../development/go-modules/generic {
# go = buildPackages.go_1_17;
#};
# That's why `buildGoModule != buildGo117Module`.
buildGo117Module = callPackage ../development/go-modules/generic {
go = buildPackages.go_1_17;
};
buildGoModule = buildGo116Module;