ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81159 from c00w/some_go_112_drop

Browse Source 
[go] Undo some 1.12 overrides that now build with 1.13
This commit is contained in:
worldofpeace 2020-03-23 17:34:58 -04:00 committed by GitHub
commit 3a6d2f7d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/cluster/terraform-providers/default.nix
View File

@ -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 {};

1
pkgs/top-level/all-packages.nix
View File

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