From ab7ef0c547b474bc31c41f1162b73ee47e34d49e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 18 Jun 2020 00:54:12 +0100
Subject: chore(3p): Use typedGo as the main Go

Because it seems to work and we can.

Change-Id: I0ba3b6541efa8c21ead875368eca18c73db9a416
---
 third_party/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'third_party')

diff --git a/third_party/default.nix b/third_party/default.nix
index 0f25b3730e..485c4537a1 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -66,7 +66,6 @@ let
       glibc
       gmock
       gnutar
-      go
       google-cloud-sdk
       graphviz
       gzip
@@ -169,7 +168,7 @@ in exposed.lib.fix(self: exposed // {
 
   # Packages to be overridden
   originals = {
-    inherit (nixpkgs) grpc notmuch;
+    inherit (nixpkgs) go grpc notmuch;
     inherit (stableNixpkgs) git;
     ffmpeg = nixpkgs.ffmpeg-full;
   };
@@ -182,7 +181,7 @@ in exposed.lib.fix(self: exposed // {
   # The Go authors have released a version of Go (in alpha) that has a
   # type system. This makes it available, specifically for use with
   # //nix/buildTypedGo.
-  typedGo = nixpkgs.go.overrideAttrs(old: {
+  go = nixpkgs.go.overrideAttrs(old: {
     version = "dev-go2go";
     doCheck = false;
     patches = []; # they all don't apply and are mostly about Darwin crap
-- 
cgit 1.4.1