From e3ddea03f0c6b42ad5e2fb80165055382c5d8aba Mon Sep 17 00:00:00 2001
From: Michael Lynch <mtlynch@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:31:01 -0500
Subject: [PATCH] Upgrade to go 1.23.3 (#368)

---
 .circleci/config.yml | 2 +-
 Dockerfile           | 2 +-
 flake.nix            | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a2446c6..a98cd376 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ executors:
   go:
     docker:
       # cimg version wasn't available at upgrade time.
-      - image: golang:1.23.0
+      - image: golang:1.23.3
 jobs:
   check_whitespace:
     docker:
diff --git a/Dockerfile b/Dockerfile
index ee626a6c..d19b6ca5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.0 AS builder
+FROM golang:1.23.3 AS builder
 
 ARG TARGETPLATFORM
 
diff --git a/flake.nix b/flake.nix
index e55368d6..037d1e58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,8 +4,11 @@
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
 
-    # 1.23.0 release
-    go-nixpkgs.url = "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465";
+    # 1.23.2 release
+    # We temporarily mismatch the version in Docker (1.23.3) because Nix doesn't
+    # have the latest version yet, but we need to fix:
+    # https://github.com/golang/go/issues/68976
+    go-nixpkgs.url = "github:NixOS/nixpkgs/4ae2e647537bcdbb82265469442713d066675275";
 
     # 3.44.2 release
     sqlite-nixpkgs.url = "github:NixOS/nixpkgs/5ad9903c16126a7d949101687af0aa589b1d7d3d";