From 1c81ccb99634d107eb7f9b986bc4822c7a517d13 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 22 Nov 2021 00:09:43 +0300 Subject: fix(3p): Move away from builtins.fetchGit Moves to the derivation-based git fetchers everywhere in third-party. This might help with forward-compatibility with newer Nix versions, though that's not our primary concern right now. Change-Id: I565bb72585b8639893e9ea3a9e233338aede63a9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3903 Tested-by: BuildkiteCI Reviewed-by: zseri --- third_party/gopkgs/github.com/golang/groupcache/default.nix | 10 ++++++++-- third_party/gopkgs/github.com/golang/protobuf/default.nix | 6 ++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'third_party/gopkgs/github.com/golang') diff --git a/third_party/gopkgs/github.com/golang/groupcache/default.nix b/third_party/gopkgs/github.com/golang/groupcache/default.nix index 4c12173ed960..c2fc341feafd 100644 --- a/third_party/gopkgs/github.com/golang/groupcache/default.nix +++ b/third_party/gopkgs/github.com/golang/groupcache/default.nix @@ -1,9 +1,15 @@ -{ depot, ... }: +{ depot, pkgs, ... }: depot.nix.buildGo.external { path = "github.com/golang/groupcache"; - src = builtins.fetchGit { + + src = pkgs.fetchgit { url = "https://github.com/golang/groupcache"; rev = "611e8accdfc92c4187d399e95ce826046d4c8d73"; + hash = "sha256:0ydaq1xn03h2arfdri0vcv0df19pk8dvq4ly5hm1kv18yjfv1v13"; }; + + deps = with depot.third_party; [ + gopkgs."github.com".golang.protobuf.proto + ]; } diff --git a/third_party/gopkgs/github.com/golang/protobuf/default.nix b/third_party/gopkgs/github.com/golang/protobuf/default.nix index 5a4290dec2a1..119eafb42c15 100644 --- a/third_party/gopkgs/github.com/golang/protobuf/default.nix +++ b/third_party/gopkgs/github.com/golang/protobuf/default.nix @@ -1,9 +1,11 @@ -{ depot, ... }: +{ depot, pkgs, ... }: depot.nix.buildGo.external { path = "github.com/golang/protobuf"; - src = builtins.fetchGit { + + src = pkgs.fetchgit { url = "https://github.com/golang/protobuf"; rev = "ed6926b37a637426117ccab59282c3839528a700"; + hash = "sha256:0fynqrim022x9xi2bivkw19npbz4316v4yr7mb677s9s36z4dc4h"; }; } -- cgit 1.4.1