From 9594203e07f51541b56ac08c752d5f30ec2d2de2 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 13 Dec 2019 12:12:06 +0000 Subject: 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. --- third_party/gopkgs/golang.org/x/net/default.nix | 15 +++++++++++++++ third_party/gopkgs/golang.org/x/oauth2/default.nix | 14 ++++++++++++++ third_party/gopkgs/golang.org/x/sys/default.nix | 12 ++++++++++++ third_party/gopkgs/golang.org/x/text/default.nix | 12 ++++++++++++ 4 files changed, 53 insertions(+) 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 (limited to 'third_party/gopkgs/golang.org') 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 0000000000..571a2b1d36 --- /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 0000000000..e4955d591a --- /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 0000000000..5d1b26af48 --- /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 0000000000..f6107e6387 --- /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; [ + ]; +} -- cgit 1.4.1