From 1c81ccb99634d107eb7f9b986bc4822c7a517d13 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
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 <zseri.devel@ytrizja.de>
---
 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    | 6 ++++--
 third_party/gopkgs/golang.org/x/text/default.nix   | 6 ++++--
 third_party/gopkgs/golang.org/x/time/default.nix   | 5 +++--
 6 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'third_party/gopkgs/golang.org')

diff --git a/third_party/gopkgs/golang.org/x/crypto/default.nix b/third_party/gopkgs/golang.org/x/crypto/default.nix
index dfaf4ac856..41c3b4e726 100644
--- a/third_party/gopkgs/golang.org/x/crypto/default.nix
+++ b/third_party/gopkgs/golang.org/x/crypto/default.nix
@@ -1,10 +1,12 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/crypto";
-  src = builtins.fetchGit {
+
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/crypto";
     rev = "e9b2fee46413994441b28dfca259d911d963dfed";
+    hash = "sha256:18sz5426h320l9gdll9n43lzzxg2dmqv0s5fjy6sbvbkkpjs1m28";
   };
 
   deps = with depot.third_party; [
diff --git a/third_party/gopkgs/golang.org/x/net/default.nix b/third_party/gopkgs/golang.org/x/net/default.nix
index 899600dab0..9a8fef6948 100644
--- a/third_party/gopkgs/golang.org/x/net/default.nix
+++ b/third_party/gopkgs/golang.org/x/net/default.nix
@@ -1,10 +1,12 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/net";
-  src = builtins.fetchGit {
+
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/net";
     rev = "c0dbc17a35534bf2e581d7a942408dc936316da4";
+    hash = "sha256:1f1xqh2cvr629fkg9n9k347vf6g91jkrsmgmy8hlqdrq163blb54";
   };
 
   deps = with depot.third_party; [
diff --git a/third_party/gopkgs/golang.org/x/oauth2/default.nix b/third_party/gopkgs/golang.org/x/oauth2/default.nix
index 7ad94930aa..60864ffe4a 100644
--- a/third_party/gopkgs/golang.org/x/oauth2/default.nix
+++ b/third_party/gopkgs/golang.org/x/oauth2/default.nix
@@ -1,10 +1,12 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/oauth2";
-  src = builtins.fetchGit {
+
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/oauth2";
     rev = "858c2ad4c8b6c5d10852cb89079f6ca1c7309787";
+    hash = "sha256:1dc7n8ddph8w6q0i3cwlgvjwpf2wlkx407va1ydnazasi1j5ixrw";
   };
 
   deps = with depot.third_party; [
diff --git a/third_party/gopkgs/golang.org/x/sys/default.nix b/third_party/gopkgs/golang.org/x/sys/default.nix
index 8636a9913e..8da07693ce 100644
--- a/third_party/gopkgs/golang.org/x/sys/default.nix
+++ b/third_party/gopkgs/golang.org/x/sys/default.nix
@@ -1,9 +1,11 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/sys";
-  src = builtins.fetchGit {
+
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/sys";
     rev = "ac6580df4449443a05718fd7858c1f91ad5f8d20";
+    hash = "sha256:14gvx65w5lddi20s4wypbbvbg9ni3m8777jhp9nqxhixc61k3dyi";
   };
 }
diff --git a/third_party/gopkgs/golang.org/x/text/default.nix b/third_party/gopkgs/golang.org/x/text/default.nix
index 33b7444616..f5a900b958 100644
--- a/third_party/gopkgs/golang.org/x/text/default.nix
+++ b/third_party/gopkgs/golang.org/x/text/default.nix
@@ -1,9 +1,11 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/text";
-  src = builtins.fetchGit {
+
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/text";
     rev = "cbf43d21aaebfdfeb81d91a5f444d13a3046e686";
+    hash = "sha256:1h6z2x4ijzd1126zk3lf8f3bp98j1irs7xg6p8nwpymkqkw5laq8";
   };
 }
diff --git a/third_party/gopkgs/golang.org/x/time/default.nix b/third_party/gopkgs/golang.org/x/time/default.nix
index 2a9a4da56b..1c03a8f0a9 100644
--- a/third_party/gopkgs/golang.org/x/time/default.nix
+++ b/third_party/gopkgs/golang.org/x/time/default.nix
@@ -1,10 +1,11 @@
-{ depot, ... }:
+{ depot, pkgs, ... }:
 
 depot.nix.buildGo.external {
   path = "golang.org/x/time";
 
-  src = builtins.fetchGit {
+  src = pkgs.fetchgit {
     url = "https://go.googlesource.com/time";
     rev = "555d28b269f0569763d25dbe1a237ae74c6bcc82";
+    hash = "sha256:1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r";
   };
 }
-- 
cgit 1.4.1