diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-10T00·13+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-10T11·48+0000 |
| commit | 8361b82d0ac59f436f7ecef283077b0f7d689ca1 (patch) | |
| tree | 15f9649ae9f3381c7218ea4f46fc9979a12f11bd /third_party/gopkgs/gopkg.in | |
| parent | 8d4b2f3d54e760ab9f7f8242370a54ff20796553 (diff) | |
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>
Diffstat (limited to 'third_party/gopkgs/gopkg.in')
4 files changed, 8 insertions, 8 deletions
diff --git a/third_party/gopkgs/gopkg.in/irc.v3/default.nix b/third_party/gopkgs/gopkg.in/irc.v3/default.nix index 7165dcce99..7bfe550023 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 6359919cac..b2773d85d5 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 52ac5d8697..ce5fe1d240 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 813cd1f0f1..1b4659d3d8 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"; |