From db6f261952b433bdf62fe3f483f437c42dcaf0da Mon Sep 17 00:00:00 2001
From: Devon Stewart <devon.stewart@repl.it>
Date: Wed, 9 Oct 2024 22:30:57 +0000
Subject: [PATCH] Bumping go

---
 pkgs/historical-modules/default.nix |  9 +++++++++
 pkgs/modules/default.nix            | 11 +++++++++--
 pkgs/modules/docker/default.nix     |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/historical-modules/default.nix b/pkgs/historical-modules/default.nix
index 455388d0..061a690a 100644
--- a/pkgs/historical-modules/default.nix
+++ b/pkgs/historical-modules/default.nix
@@ -78,6 +78,15 @@ let
         displayVersion = "1.20";
       };
     }
+    {
+      moduleId = "go-1.21";
+      commit = "b5aa5df636c4cd8cd1aea251e8dea4fc0aa51781";
+      overrides = {
+        # /nix/store/q6j9za8smkdbnlybg63qq5lmj7zbambr-replit-module-go-1.20
+        # .runners["go-run"].displayVersion = "1.20.4";
+        displayVersion = "1.21";
+      };
+    }
     {
       moduleId = "haskell-ghc9.0";
       commit = "c48c43c6c698223ed3ce2abc5a2d708735a77d5b";
diff --git a/pkgs/modules/default.nix b/pkgs/modules/default.nix
index cd53da1b..84f43493 100644
--- a/pkgs/modules/default.nix
+++ b/pkgs/modules/default.nix
@@ -64,9 +64,16 @@ let
     (import ./nodejs-with-prybar)
 
     (import ./go {
-      go = pkgs.go_1_21;
+      go = pkgs.go_1_22;
       gopls = pkgs.gopls.override {
-        buildGoModule = pkgs.buildGo121Module;
+        buildGoModule = pkgs.buildGo122Module;
+      };
+    })
+
+    (import ./go {
+      go = pkgs.go_1_23;
+      gopls = pkgs.gopls.override {
+        buildGoModule = pkgs.buildGo123Module;
       };
     })
 
diff --git a/pkgs/modules/docker/default.nix b/pkgs/modules/docker/default.nix
index 3d8ed06e..9ada8fc3 100644
--- a/pkgs/modules/docker/default.nix
+++ b/pkgs/modules/docker/default.nix
@@ -4,7 +4,7 @@ let
 
   configFiles = pkgs.copyPathToStore ./etc;
 
-  replit-runc = pkgs.buildGo121Module {
+  replit-runc = pkgs.buildGo123Module {
     pname = "replit-runc";
     version = "1.1.9+replit";
 
@@ -30,7 +30,7 @@ let
     '';
   };
 
-  replit-containerd = pkgs.buildGo121Module {
+  replit-containerd = pkgs.buildGo123Module {
     pname = "replit-containerd";
     version = "1.7.5+replit";
 
@@ -65,7 +65,7 @@ let
     replitShimRunc = replit-containerd;
   };
 
-  replit-buildkit = pkgs.buildGo121Module {
+  replit-buildkit = pkgs.buildGo123Module {
     pname = "replit-buildkit";
     version = "v0.13.0-beta1+replit";