treewide Drop unneeded go 1.12 overrides

This commit is contained in:
Colin L Rice 2020-02-27 00:12:59 -05:00
parent 667df74501
commit ac1336120f
2 changed files with 1 additions and 7 deletions

View file

@ -2,7 +2,6 @@
, buildGoPackage , buildGoPackage
, fetchFromGitHub , fetchFromGitHub
, callPackage , callPackage
, buildGo112Module
, Security , Security
}: }:
let let
@ -26,11 +25,7 @@ let
in in
{ {
elasticsearch = callPackage ./elasticsearch { elasticsearch = callPackage ./elasticsearch {
# Version 0.7.0 fails to build with go 1.13 due to dependencies: inherit Security;
# verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
# verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
buildGoModule = buildGo112Module;
inherit Security;
}; };
gandi = callPackage ./gandi {}; gandi = callPackage ./gandi {};
ibm = callPackage ./ibm {}; ibm = callPackage ./ibm {};

View file

@ -25996,7 +25996,6 @@ in
terraform-providers = recurseIntoAttrs ( terraform-providers = recurseIntoAttrs (
callPackage ../applications/networking/cluster/terraform-providers { callPackage ../applications/networking/cluster/terraform-providers {
inherit buildGo112Module;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
} }
); );