From 4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 21 Feb 2020 12:47:29 +0000 Subject: chore: Rename pkgs->depot in all Nix file headers --- third_party/gopkgs/golang.org/x/crypto/default.nix | 6 +++--- third_party/gopkgs/golang.org/x/net/default.nix | 6 +++--- third_party/gopkgs/golang.org/x/oauth2/default.nix | 6 +++--- third_party/gopkgs/golang.org/x/sys/default.nix | 4 ++-- third_party/gopkgs/golang.org/x/text/default.nix | 7 ++----- third_party/gopkgs/golang.org/x/time/default.nix | 4 ++-- 6 files changed, 15 insertions(+), 18 deletions(-) (limited to 'third_party/gopkgs/golang.org/x') diff --git a/third_party/gopkgs/golang.org/x/crypto/default.nix b/third_party/gopkgs/golang.org/x/crypto/default.nix index 11c9b0ea8b1b..2129f8b538b2 100644 --- a/third_party/gopkgs/golang.org/x/crypto/default.nix +++ b/third_party/gopkgs/golang.org/x/crypto/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/crypto"; src = builtins.fetchGit { url = "https://go.googlesource.com/crypto"; rev = "e9b2fee46413994441b28dfca259d911d963dfed"; }; - deps = with pkgs.third_party; [ + deps = with depot.third_party; [ gopkgs."golang.org".x.sys.unix.gopkg ]; } diff --git a/third_party/gopkgs/golang.org/x/net/default.nix b/third_party/gopkgs/golang.org/x/net/default.nix index 400ba6922b58..450369d69459 100644 --- a/third_party/gopkgs/golang.org/x/net/default.nix +++ b/third_party/gopkgs/golang.org/x/net/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/net"; src = builtins.fetchGit { url = "https://go.googlesource.com/net"; rev = "c0dbc17a35534bf2e581d7a942408dc936316da4"; }; - deps = with pkgs.third_party; [ + deps = with depot.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 index f5e783b6d189..230e62967298 100644 --- a/third_party/gopkgs/golang.org/x/oauth2/default.nix +++ b/third_party/gopkgs/golang.org/x/oauth2/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/oauth2"; src = builtins.fetchGit { url = "https://go.googlesource.com/oauth2"; rev = "858c2ad4c8b6c5d10852cb89079f6ca1c7309787"; }; - deps = with pkgs.third_party; map (p: p.gopkg) [ + deps = with depot.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 index 5655c08d822d..2d45b6286d16 100644 --- a/third_party/gopkgs/golang.org/x/sys/default.nix +++ b/third_party/gopkgs/golang.org/x/sys/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/sys"; src = builtins.fetchGit { url = "https://go.googlesource.com/sys"; diff --git a/third_party/gopkgs/golang.org/x/text/default.nix b/third_party/gopkgs/golang.org/x/text/default.nix index 409b0d0b9e2e..84753e536289 100644 --- a/third_party/gopkgs/golang.org/x/text/default.nix +++ b/third_party/gopkgs/golang.org/x/text/default.nix @@ -1,12 +1,9 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/text"; src = builtins.fetchGit { url = "https://go.googlesource.com/text"; rev = "cbf43d21aaebfdfeb81d91a5f444d13a3046e686"; }; - - deps = with pkgs.third_party; [ - ]; } diff --git a/third_party/gopkgs/golang.org/x/time/default.nix b/third_party/gopkgs/golang.org/x/time/default.nix index 6ccfc8a652ed..0c8aaeab98d3 100644 --- a/third_party/gopkgs/golang.org/x/time/default.nix +++ b/third_party/gopkgs/golang.org/x/time/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.external { +depot.buildGo.external { path = "golang.org/x/time"; src = builtins.fetchGit { -- cgit 1.4.1