nix: Fix up build output phase to use Go 1.23

adhocteam · Oct 10, 2024 · a092d41 · a092d41
1 parent 23619eb
commit a092d41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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 ])
               }
             '';
           };