From 9594203e07f51541b56ac08c752d5f30ec2d2de2 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 13 Dec 2019 12:12:06 +0000 Subject: [PATCH] feat(third_party/gopkgs): Import external packages for Google Cloud These packages contain the Cloud SDK for Go. There is currently a linker issue (presumably due to something in `buildGo.nix`) that means that projects using them can not actually be built. --- .../gopkgs/cloud.google.com/go/default.nix | 12 +++++++++++ .../github.com/golang/protobuf/default.nix | 12 +++++++++++ .../github.com/googleapis/gax-go/default.nix | 19 +++++++++++++++++ .../hashicorp/golang-lru/default.nix | 14 +++++++++++++ .../gopkgs/go.opencensus.io/default.nix | 13 ++++++++++++ .../gopkgs/golang.org/x/net/default.nix | 15 +++++++++++++ .../gopkgs/golang.org/x/oauth2/default.nix | 14 +++++++++++++ .../gopkgs/golang.org/x/sys/default.nix | 12 +++++++++++ .../gopkgs/golang.org/x/text/default.nix | 12 +++++++++++ .../gopkgs/google.golang.org/api/default.nix | 20 ++++++++++++++++++ .../google.golang.org/genproto/default.nix | 14 +++++++++++++ .../gopkgs/google.golang.org/grpc/default.nix | 21 +++++++++++++++++++ 12 files changed, 178 insertions(+) create mode 100644 third_party/gopkgs/cloud.google.com/go/default.nix create mode 100644 third_party/gopkgs/github.com/golang/protobuf/default.nix create mode 100644 third_party/gopkgs/github.com/googleapis/gax-go/default.nix create mode 100644 third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix create mode 100644 third_party/gopkgs/go.opencensus.io/default.nix create mode 100644 third_party/gopkgs/golang.org/x/net/default.nix create mode 100644 third_party/gopkgs/golang.org/x/oauth2/default.nix create mode 100644 third_party/gopkgs/golang.org/x/sys/default.nix create mode 100644 third_party/gopkgs/golang.org/x/text/default.nix create mode 100644 third_party/gopkgs/google.golang.org/api/default.nix create mode 100644 third_party/gopkgs/google.golang.org/genproto/default.nix create mode 100644 third_party/gopkgs/google.golang.org/grpc/default.nix diff --git a/third_party/gopkgs/cloud.google.com/go/default.nix b/third_party/gopkgs/cloud.google.com/go/default.nix new file mode 100644 index 000000000..655a4d284 --- /dev/null +++ b/third_party/gopkgs/cloud.google.com/go/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "cloud.google.com/go"; + src = builtins.fetchGit { + url = "https://code.googlesource.com/gocloud"; + rev = "76e973f7c1e722b4859698ace0daed4e7eccdc60"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + ]; +} diff --git a/third_party/gopkgs/github.com/golang/protobuf/default.nix b/third_party/gopkgs/github.com/golang/protobuf/default.nix new file mode 100644 index 000000000..5976cf199 --- /dev/null +++ b/third_party/gopkgs/github.com/golang/protobuf/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "github.com/golang/protobuf"; + src = builtins.fetchGit { + url = "https://github.com/golang/protobuf"; + rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b"; + }; + + deps = with pkgs.third_party; [ + ]; +} diff --git a/third_party/gopkgs/github.com/googleapis/gax-go/default.nix b/third_party/gopkgs/github.com/googleapis/gax-go/default.nix new file mode 100644 index 000000000..22873a7e8 --- /dev/null +++ b/third_party/gopkgs/github.com/googleapis/gax-go/default.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: + +let + inherit (pkgs) buildGo; + inherit (builtins) fetchGit; +in pkgs.buildGo.external { + path = "github.com/googleapis/gax-go"; + src = fetchGit { + url = "https://github.com/googleapis/gax-go"; + rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; + }; + + deps = with pkgs.third_party; [ + gopkgs."golang.org".x.net.trace.gopkg + gopkgs."google.golang.org".grpc.gopkg + gopkgs."google.golang.org".grpc.codes.gopkg + gopkgs."google.golang.org".grpc.status.gopkg + ]; +} diff --git a/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix new file mode 100644 index 000000000..04efc3144 --- /dev/null +++ b/third_party/gopkgs/github.com/hashicorp/golang-lru/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "github.com/hashicorp/golang-lru"; + src = builtins.fetchGit { + url = "https://github.com/hashicorp/golang-lru"; + rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + gopkgs."golang.org".x.net.context.ctxhttp + gopkgs."cloud.google.com".go.compute.metadata + ]; +} diff --git a/third_party/gopkgs/go.opencensus.io/default.nix b/third_party/gopkgs/go.opencensus.io/default.nix new file mode 100644 index 000000000..8abd75748 --- /dev/null +++ b/third_party/gopkgs/go.opencensus.io/default.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "go.opencensus.io"; + src = builtins.fetchGit { + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "b4a14686f0a98096416fe1b4cb848e384fb2b22b"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + gopkgs."github.com".hashicorp.golang-lru.simplelru + ]; +} diff --git a/third_party/gopkgs/golang.org/x/net/default.nix b/third_party/gopkgs/golang.org/x/net/default.nix new file mode 100644 index 000000000..571a2b1d3 --- /dev/null +++ b/third_party/gopkgs/golang.org/x/net/default.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "golang.org/x/net"; + src = builtins.fetchGit { + url = "https://go.googlesource.com/net"; + rev = "74dc4d7220e7acc4e100824340f3e66577424772"; + }; + + deps = with pkgs.third_party; [ + gopkgs."golang.org".x.text.secure.bidirule.gopkg + gopkgs."golang.org".x.text.unicode.bidi.gopkg + gopkgs."golang.org".x.text.unicode.norm.gopkg + ]; +} diff --git a/third_party/gopkgs/golang.org/x/oauth2/default.nix b/third_party/gopkgs/golang.org/x/oauth2/default.nix new file mode 100644 index 000000000..e4955d591 --- /dev/null +++ b/third_party/gopkgs/golang.org/x/oauth2/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "golang.org/x/oauth2"; + src = builtins.fetchGit { + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + gopkgs."golang.org".x.net.context.ctxhttp + gopkgs."cloud.google.com".go.compute.metadata + ]; +} diff --git a/third_party/gopkgs/golang.org/x/sys/default.nix b/third_party/gopkgs/golang.org/x/sys/default.nix new file mode 100644 index 000000000..5d1b26af4 --- /dev/null +++ b/third_party/gopkgs/golang.org/x/sys/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "golang.org/x/sys"; + src = builtins.fetchGit { + url = "https://go.googlesource.com/sys"; + rev = "fde4db37ae7ad8191b03d30d27f258b5291ae4e3"; + }; + + deps = with pkgs.third_party; [ + ]; +} diff --git a/third_party/gopkgs/golang.org/x/text/default.nix b/third_party/gopkgs/golang.org/x/text/default.nix new file mode 100644 index 000000000..f6107e638 --- /dev/null +++ b/third_party/gopkgs/golang.org/x/text/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "golang.org/x/text"; + src = builtins.fetchGit { + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + }; + + deps = with pkgs.third_party; [ + ]; +} diff --git a/third_party/gopkgs/google.golang.org/api/default.nix b/third_party/gopkgs/google.golang.org/api/default.nix new file mode 100644 index 000000000..4c2e79cd9 --- /dev/null +++ b/third_party/gopkgs/google.golang.org/api/default.nix @@ -0,0 +1,20 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "google.golang.org/api"; + src = builtins.fetchGit { + url = "https://code.googlesource.com/google-api-go-client"; + rev = "573115b31dcba90b19c25508412495d63f86e804"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + gopkgs."github.com".googleapis.gax-go.v2 + gopkgs."golang.org".x.oauth2.google + gopkgs."golang.org".x.oauth2 + gopkgs."google.golang.org".grpc + gopkgs."google.golang.org".grpc.naming + gopkgs."go.opencensus.io".plugin.ochttp + gopkgs."go.opencensus.io".trace + gopkgs."go.opencensus.io".trace.propagation + ]; +} diff --git a/third_party/gopkgs/google.golang.org/genproto/default.nix b/third_party/gopkgs/google.golang.org/genproto/default.nix new file mode 100644 index 000000000..c7a7b741b --- /dev/null +++ b/third_party/gopkgs/google.golang.org/genproto/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "google.golang.org/genproto"; + src = builtins.fetchGit { + url = "https://github.com/google/go-genproto"; + rev = "55e96fffbd486c27fc0d5b4468c497d0de3f2727"; + }; + + deps = with pkgs.third_party; [ + gopkgs."github.com".golang.protobuf.proto.gopkg + gopkgs."github.com".golang.protobuf.ptypes.any.gopkg + ]; +} diff --git a/third_party/gopkgs/google.golang.org/grpc/default.nix b/third_party/gopkgs/google.golang.org/grpc/default.nix new file mode 100644 index 000000000..a8885c4b1 --- /dev/null +++ b/third_party/gopkgs/google.golang.org/grpc/default.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: + +pkgs.buildGo.external { + path = "google.golang.org/grpc"; + src = builtins.fetchGit { + url = "https://github.com/grpc/grpc-go"; + rev = "451cf373a706e089ca34abd9ea14cbc20b34c1fc"; + }; + + deps = with pkgs.third_party; map (p: p.gopkg) [ + gopkgs."golang.org".x.net.trace + gopkgs."golang.org".x.net.http2 + gopkgs."golang.org".x.net.http2.hpack + gopkgs."golang.org".x.sys.unix + gopkgs."github.com".golang.protobuf.proto + gopkgs."github.com".golang.protobuf.ptypes + gopkgs."github.com".golang.protobuf.ptypes.duration + gopkgs."github.com".golang.protobuf.ptypes.timestamp + gopkgs."google.golang.org".genproto.googleapis.rpc.status + ]; +}