Merge pull request #81159 from c00w/some_go_112_drop
[go] Undo some 1.12 overrides that now build with 1.13
This commit is contained in:
commit
3a6d2f7d30
2 changed files with 1 additions and 7 deletions
|
@ -2,7 +2,6 @@
|
|||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, callPackage
|
||||
, buildGo112Module
|
||||
, Security
|
||||
}:
|
||||
let
|
||||
|
@ -26,11 +25,7 @@ let
|
|||
in
|
||||
{
|
||||
elasticsearch = callPackage ./elasticsearch {
|
||||
# Version 0.7.0 fails to build with go 1.13 due to dependencies:
|
||||
# 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;
|
||||
inherit Security;
|
||||
};
|
||||
gandi = callPackage ./gandi {};
|
||||
ibm = callPackage ./ibm {};
|
||||
|
|
|
@ -26005,7 +26005,6 @@ in
|
|||
|
||||
terraform-providers = recurseIntoAttrs (
|
||||
callPackage ../applications/networking/cluster/terraform-providers {
|
||||
inherit buildGo112Module;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
}
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue