From a092d413674587b0307ba8654e77028b66769c60 Mon Sep 17 00:00:00 2001
From: Paul Smith <paul@adhocteam.us>
Date: Thu, 10 Oct 2024 15:41:39 -0500
Subject: [PATCH] nix: Fix up build output phase to use Go 1.23

---
 .github/workflows/golang-lint.yml |  4 ++--
 flake.nix                         | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/golang-lint.yml b/.github/workflows/golang-lint.yml
index ea3b7f3..2315f8a 100644
--- a/.github/workflows/golang-lint.yml
+++ b/.github/workflows/golang-lint.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.23"
           check-latest: true
 
       - name: golangci-lint
diff --git a/flake.nix b/flake.nix
index ecf1488..4159f2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,17 +46,22 @@
           };
 
         in {
-          default = pkgs.buildGoModule rec {
+          # https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/go/module.nix
+          default = pkgs.buildGoModule.override {
+            go = pkgs.go_1_23;
+          } rec {
             inherit pname version src vendorHash subPackages CGO_ENABLED meta;
           };
 
-          withGo = pkgs.buildGoModule rec {
+          withGo = pkgs.buildGoModule.override {
+            go = pkgs.go_1_23;
+          } rec {
             inherit pname version src vendorHash subPackages CGO_ENABLED meta;
             nativeBuildInputs = with pkgs; [ makeWrapper ];
             allowGoReference = true;
             postInstall = ''
               wrapProgram $out/bin/${pname} --prefix PATH : ${
-                pkgs.lib.makeBinPath (with pkgs; [ go ])
+                pkgs.lib.makeBinPath (with pkgs; [ go_1_23 ])
               }
             '';
           };