From 5c6ca959125cdd69be6423e416ac6268dc5bf61f Mon Sep 17 00:00:00 2001
From: Myzel394 <github.7a2op@simplelogin.co>
Date: Thu, 29 May 2025 19:58:11 +0200
Subject: [PATCH] chore(server): Update go version

Signed-off-by: Myzel394 <github.7a2op@simplelogin.co>
---
 flake.nix     | 26 +++-----------------------
 server/go.mod |  2 +-
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/flake.nix b/flake.nix
index e55fba1..5131add 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,7 @@
           pname = "github.com/Myzel394/config-lsp";
           version = version;
           src = ./server;
-          vendorHash = "sha256-ttr45N8i86mSJX9Scy/Cf+YlxU5wAKMVb0YhKg28JKM=";
+          vendorHash = "sha256-ttr45N8i86mSJX9Scy/Cf+YlxU5wAKMVb0YhKg28JKM";
           ldflags = [ "-s" "-w" ];
           checkPhase = ''
             go test -v $(pwd)/...
@@ -68,6 +68,7 @@
       in {
         packages = {
           default = server;
+          "server-uncompressed" = serverUncompressed;
           "vs-code-extension-bare" = let
             name = "config-lsp";
             node-modules = pkgs.mkYarnPackage {
@@ -133,28 +134,7 @@
         };
 
         devShells.default = let 
-          version = "0.16.2";
-          ourGopls = pkgs.buildGoModule {
-              pname = "gopls";
-              inherit version;
-              modRoot = "gopls";
-              vendorHash = "sha256-ta94xPboFtSxFeuMtPX76XiC1O7osNl4oLk64wIyyz4=";
-
-              # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30
-              ldflags = [ "-X main.version=v${version}" ];
-
-              doCheck = false;
-
-              # Only build gopls, and not the integration tests or documentation generator.
-              subPackages = [ "." ];
-
-              src = pkgs.fetchFromGitHub {
-                owner = "golang";
-                repo = "tools";
-                rev = "gopls/v${version}";
-                hash = "sha256-amy00VMUcmyjDoZ4d9/+YswfcZ+1/cGvFsA4sAmc1dA=";
-              };
-          };
+          ourGopls = pkgs.gopls;
         in
           pkgs.mkShell {
             buildInputs = inputs ++ (with pkgs; [
diff --git a/server/go.mod b/server/go.mod
index ba46ef0..dce457d 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -1,6 +1,6 @@
 module config-lsp
 
-go 1.22.5
+go 1.24
 
 require (
 	github.com/antlr4-go/antlr/v4 v4.13.1