7 files changed, 3 insertions, 89 deletions
diff --git a/nix/buildTypedGo/default.nix b/nix/buildTypedGo/default.nix
deleted file mode 100644
index f135b1ebb454..000000000000
--- a/nix/buildTypedGo/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# A crude wrapper around //nix/buildGo that supports the Go 2 alpha.
-#
-# The way the alpha is implemented is via a transpiler from typed to
-# untyped Go.
-{ depot, pkgs, ... }:
-
-let
-  inherit (builtins)
-    baseNameOf
-    stringLength
-    substring;
-
-  inherit (depot.nix.buildGo) gpackage program;
-
-  go2goext = file: substring 0 ((stringLength file) - 1) file;
-  go2go = file: pkgs.runCommandNoCC "${go2goext (baseNameOf file)}" {} ''
-    cp ${file} .
-    ${pkgs.go}/bin/go tool go2go translate *.go2
-    mv *.go $out
-  '';
-
-in rec {
-  program = { name, srcs, deps ? [], x_defs ? {} }: depot.nix.buildGo.program {
-    inherit name deps x_defs;
-    srcs = map go2go srcs;
-  };
-
-  package = { name, srcs, deps ? [], path ? name, sfiles ? [] }: depot.nix.buildGo.package {
-    inherit name deps path sfiles;
-    srcs = map go2go srcs;
-  };
-}
diff --git a/nix/buildTypedGo/example/default.nix b/nix/buildTypedGo/example/default.nix
deleted file mode 100644
index 5b6d4171f99c..000000000000
--- a/nix/buildTypedGo/example/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ depot, ... }:
-
-depot.nix.buildTypedGo.program {
-  name = "example";
-  srcs = [
-    ./main.go2
-  ];
-}
diff --git a/nix/buildTypedGo/example/main.go2 b/nix/buildTypedGo/example/main.go2
deleted file mode 100644
index 8986f57b94c7..000000000000
--- a/nix/buildTypedGo/example/main.go2
+++ /dev/null
@@ -1,15 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-func Print(type T)(s []T) {
-	for _, v := range s {
-		fmt.Print(v)
-	}
-}
-
-func main() {
-	Print([]string{"Hello, ", "TVL\n"})
-}
diff --git a/ops/besadii/default.nix b/ops/besadii/default.nix
index 48856fce0651..bcf83778b73f 100644
--- a/ops/besadii/default.nix
+++ b/ops/besadii/default.nix
@@ -4,7 +4,7 @@
 
 let
   inherit (builtins) toFile toJSON;
-in depot.nix.buildTypedGo.program {
+in depot.nix.buildGo.program {
   name = "besadii";
-  srcs = [ ./main.go2 ];
+  srcs = [ ./main.go ];
 }
diff --git a/ops/besadii/main.go2 b/ops/besadii/main.go
index 998c677010bc..998c677010bc 100644
--- a/ops/besadii/main.go2
+++ b/ops/besadii/main.go
diff --git a/third_party/default.nix b/third_party/default.nix
index 5c99b55d15f4..096396d3b64f 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -67,36 +67,6 @@ in exposed.lib.fix(self: exposed // {
   emacs27-nox = assert ((exposed.lib.versions.major nixpkgs.emacs.version) == "27");
     nixpkgs.emacs-nox;
 
-  # 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.
-  go = nixpkgs.go.overrideAttrs(old: {
-    version = "dev-go2go";
-    doCheck = false;
-    patches = []; # they all don't apply and are mostly about Darwin crap
-
-    src = nixpkgs.fetchgit {
-      url = "https://go.googlesource.com/go";
-      # You might think these hashes are trivial to update. It's just
-      # a branch in a git repository, right?
-      #
-      # Well, think again. Somehow I managed to get no fewer than 3
-      # (!) different commit hashes for the same branch by cloning
-      # this repository thrice. Only the third one (which you, the
-      # reader, can find below for your reading pleasure) actually
-      # gave me `go tool go2go`.
-      rev = "ad307489d41133f32c779cfa1b0db4a852ace047";
-      leaveDotGit = true;
-      sha256 = "1nxmqdlyfx7w3g5vhjfq24yrc9hwpsa2mjv58xrmhh8vvy50ziqq";
-
-      postFetch = ''
-        cd $out
-        ${nixpkgs.git}/bin/git log -n 1 "--format=format:devel +%H %cd" HEAD > VERSION
-        rm -rf .git
-      '';
-    };
-  });
-
   # Make NixOS available
   nixos = import "${nixpkgsSrc}/nixos";
 })
diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix
index b24f134bc6bd..bf8d7eac5e1e 100644
--- a/third_party/nixpkgs-exposed/exposed/default.nix
+++ b/third_party/nixpkgs-exposed/exposed/default.nix
@@ -62,6 +62,7 @@
     gmock
     gnused
     gnutar
+    go
     google-cloud-sdk
     graphviz
     gzip