From badbb7550db0ee3a8f44e736ec698609283e668b Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kristoffer@tailscale.com>
Date: Tue, 10 Feb 2026 16:46:17 +0100
Subject: [PATCH] build: update golangci-lint and gopls in flake

---
 .pre-commit-config.yaml |  2 +-
 flake.nix               | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b05f2566..f0242a4e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -48,7 +48,7 @@ repos:
       # golangci-lint for Go code quality
       - id: golangci-lint
         name: golangci-lint
-        entry: golangci-lint run --new-from-rev=HEAD~1 --timeout=5m --fix
+        entry: nix develop --command -- golangci-lint run --new-from-rev=HEAD~1 --timeout=5m --fix
         language: system
         types: [go]
         pass_filenames: false
diff --git a/flake.nix b/flake.nix
index 7a47787c..ae02d0ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,11 +135,6 @@
             };
           };
 
-          # The package uses buildGo125Module, not the convention.
-          # goreleaser = prev.goreleaser.override {
-          #   buildGoModule = buildGo;
-          # };
-
           gotestsum = prev.gotestsum.override {
             buildGoModule = buildGo;
           };
@@ -152,9 +147,9 @@
             buildGoModule = buildGo;
           };
 
-          # gopls = prev.gopls.override {
-          #   buildGoModule = buildGo;
-          # };
+          gopls = prev.gopls.override {
+            buildGoLatestModule = buildGo;
+          };
         };
     }
     // flake-utils.lib.eachDefaultSystem