refactor(third_party): Consistent use of depot.third_party vs. pkgs r/2461

In preparation for the solution of b/108, we need to consistently use
`depot.third_party` for packages that are only packed in the TVL depot
and `pkgs` for things that come from nixpkgs.

This commit cleans up a huge chunk of these uses in //third_party

Change-Id: Ic382c0cdea7330a84d5f0b7d109c824ddceb94e7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2912
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>

17 files changed, 34 insertions, 34 deletions

diff --git a/third_party/gopkgs/github.com/cenkalti/backoff/default.nix b/third_party/gopkgs/github.com/cenkalti/backoff/default.nix
index ea9826f5d06c..c0e0335de734 100644
--- a/third_party/gopkgs/github.com/cenkalti/backoff/default.nix
+++ b/third_party/gopkgs/github.com/cenkalti/backoff/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/cenkalti/backoff/v4";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "cenkalti";
     repo = "backoff";
     rev = "18fe4ce5a8550e0d0919b680ad3c080a5455bddf";
diff --git a/third_party/gopkgs/github.com/davecgh/go-spew/default.nix b/third_party/gopkgs/github.com/davecgh/go-spew/default.nix
index f8e6b07c5cf4..1395f3dce699 100644
--- a/third_party/gopkgs/github.com/davecgh/go-spew/default.nix
+++ b/third_party/gopkgs/github.com/davecgh/go-spew/default.nix
@@ -1,8 +1,8 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/davecgh/go-spew";
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "davecgh";
     repo = "go-spew";
     rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
diff --git a/third_party/gopkgs/github.com/emirpasic/gods/default.nix b/third_party/gopkgs/github.com/emirpasic/gods/default.nix
index decc45350a5f..a858660f4335 100644
--- a/third_party/gopkgs/github.com/emirpasic/gods/default.nix
+++ b/third_party/gopkgs/github.com/emirpasic/gods/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/emirpasic/gods";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "emirpasic";
     repo = "gods";
     rev = "4e23915b9a82f35f320a68a395a7a5045c826932";
diff --git a/third_party/gopkgs/github.com/golang/glog/default.nix b/third_party/gopkgs/github.com/golang/glog/default.nix
index 71de4fbf54f2..c8426f2b1a2f 100644
--- a/third_party/gopkgs/github.com/golang/glog/default.nix
+++ b/third_party/gopkgs/github.com/golang/glog/default.nix
@@ -1,8 +1,8 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/golang/glog";
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "golang";
     repo = "glog";
     rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
diff --git a/third_party/gopkgs/github.com/google/uuid/default.nix b/third_party/gopkgs/github.com/google/uuid/default.nix
index b1642e25e279..191863bf0eab 100644
--- a/third_party/gopkgs/github.com/google/uuid/default.nix
+++ b/third_party/gopkgs/github.com/google/uuid/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/google/uuid";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "google";
     repo = "uuid";
     rev = "c2e93f3ae59f2904160ceaab466009f965df46d6";
diff --git a/third_party/gopkgs/github.com/jbenet/go-context/default.nix b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
index d4013f0e8eb5..401fc6eb40e7 100644
--- a/third_party/gopkgs/github.com/jbenet/go-context/default.nix
+++ b/third_party/gopkgs/github.com/jbenet/go-context/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/jbenet/go-context";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "jbenet";
     repo = "go-context";
     rev = "d14ea06fba99483203c19d92cfcd13ebe73135f4";
diff --git a/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix b/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
index d8b699c54b49..6b4e8f5275bc 100644
--- a/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
+++ b/third_party/gopkgs/github.com/kevinburke/ssh_config/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/kevinburke/ssh_config";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "kevinburke";
     repo = "ssh_config";
     rev = "01f96b0aa0cdcaa93f9495f89bbc6cb5a992ce6e";
diff --git a/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix b/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
index a95fe63433cf..8c593eaae8c5 100644
--- a/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
+++ b/third_party/gopkgs/github.com/mitchellh/go-homedir/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/mitchellh/go-homedir";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "mitchellh";
     repo = "go-homedir";
     rev = "af06845cf3004701891bf4fdb884bfe4920b3727";
diff --git a/third_party/gopkgs/github.com/pkg/browser/default.nix b/third_party/gopkgs/github.com/pkg/browser/default.nix
index 8515095f0f6d..4588c1b589a5 100644
--- a/third_party/gopkgs/github.com/pkg/browser/default.nix
+++ b/third_party/gopkgs/github.com/pkg/browser/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/pkg/browser";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "pkg";
     repo = "browser";
     rev = "0a3d74bf9ce488f035cf5bc36f753a711bc74334";
diff --git a/third_party/gopkgs/github.com/sergi/go-diff/default.nix b/third_party/gopkgs/github.com/sergi/go-diff/default.nix
index dfb0640c8b30..72fb96d475ee 100644
--- a/third_party/gopkgs/github.com/sergi/go-diff/default.nix
+++ b/third_party/gopkgs/github.com/sergi/go-diff/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/sergi/go-diff";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "sergi";
     repo = "go-diff";
     rev = "58c5cb1602ee9676b5d3590d782bedde80706fcc";
diff --git a/third_party/gopkgs/github.com/src-d/gcfg/default.nix b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
index b7f5b3b656e6..210ab1bc70a2 100644
--- a/third_party/gopkgs/github.com/src-d/gcfg/default.nix
+++ b/third_party/gopkgs/github.com/src-d/gcfg/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/src-d/gcfg";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "src-d";
     repo = "gcfg";
     rev = "1ac3a1ac202429a54835fe8408a92880156b489d";
diff --git a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
index d0022806522a..078592aa9d5f 100644
--- a/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
+++ b/third_party/gopkgs/github.com/xanzy/ssh-agent/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "github.com/xanzy/ssh-agent";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "xanzy";
     repo = "ssh-agent";
     rev = "6a3e2ff9e7c564f36873c2e36413f634534f1c44";
diff --git a/third_party/gopkgs/googlemaps.github.io/maps.nix b/third_party/gopkgs/googlemaps.github.io/maps.nix
index b84977b334e8..4d29cc2f8993 100644
--- a/third_party/gopkgs/googlemaps.github.io/maps.nix
+++ b/third_party/gopkgs/googlemaps.github.io/maps.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "googlemaps.github.io/maps";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "googlemaps";
     repo = "google-maps-services-go";
     rev = "a46d9fca56ac82caa79408b2417ea93a75e3b986";
diff --git a/third_party/gopkgs/gopkg.in/irc.v3/default.nix b/third_party/gopkgs/gopkg.in/irc.v3/default.nix
index 7165dcce9952..7bfe5500232c 100644
--- a/third_party/gopkgs/gopkg.in/irc.v3/default.nix
+++ b/third_party/gopkgs/gopkg.in/irc.v3/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "gopkg.in/irc.v3";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "go-irc";
     repo = "irc";
     rev = "21a5301d6035ea204b2a7bb522a7b4598e5f6b28";
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
index 6359919cacb0..b2773d85d518 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-billy/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "gopkg.in/src-d/go-billy.v4";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "src-d";
     repo = "go-billy";
     rev = "fd409ff12f33d0d60af0ce0abeb8d93df360af49";
diff --git a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
index 52ac5d869732..ce5fe1d24073 100644
--- a/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
+++ b/third_party/gopkgs/gopkg.in/src-d/go-git/default.nix
@@ -1,11 +1,11 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   # .v4 is used throughout the codebase and I can't be bothered to do
   # anything else about it other than using that package path here.
   path = "gopkg.in/src-d/go-git.v4";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "src-d";
     repo = "go-git";
     rev = "1a7db85bca7027d90afdb5ce711622aaac9feaed";
diff --git a/third_party/gopkgs/gopkg.in/warnings/default.nix b/third_party/gopkgs/gopkg.in/warnings/default.nix
index 813cd1f0f16e..1b4659d3d84d 100644
--- a/third_party/gopkgs/gopkg.in/warnings/default.nix
+++ b/third_party/gopkgs/gopkg.in/warnings/default.nix
@@ -1,9 +1,9 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "gopkg.in/warnings.v0";
 
-  src = depot.third_party.fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "go-warnings";
     repo = "warnings";
     rev = "27b9fabbdaf131d2169ec3ff7db8ffc4d839635e";