From 0b095edabcb0d31be1e8b115b67668251a96cab6 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 23 Jul 2025 16:15:30 +0200
Subject: [PATCH] Update and improve nix flake (#5349)

---
 flake.lock |  6 ++---
 flake.nix  | 66 ++++++++++++++++++++++++++++++------------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index d7882045e..342e7d6c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748358057,
-        "narHash": "sha256-JrIw2CvtXFUzFiUl+Nlw0TRxFfBzfix+ay2Dq0e/HAI=",
+        "lastModified": 1753273077,
+        "narHash": "sha256-fp8L9m6Z3TDNV8+IczogsTcwWcaYuxLIzG/M4aAFkmA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "495e5187df01bad31fbe7faf4bc20feade7132d8",
+        "rev": "2bb57ed7e7fc2b7ce3b39c6934e4fb069dc7922d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5290b0018..3a0913984 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,37 +12,45 @@
         pkgs = nixpkgs.legacyPackages.${system};
       in
       {
-        devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            # generic
-            gnumake
-            gnutar
-            zip
-            tree
+        devShells.default =
+          with pkgs;
+          let
+            go = go_1_24;
+          in
+          pkgs.mkShell {
+            buildInputs = [
+              # generic
+              gnumake
+              gnutar
+              gzip
+              zip
+              tree
 
-            # frontend
-            nodejs_24
-            pnpm
-            nodePackages.typescript
-            nodePackages.typescript-language-server
+              # frontend
+              nodejs_24
+              pnpm
+              nodePackages.typescript
+              nodePackages.typescript-language-server
 
-            # backend
-            go_1_24
-            glibc.static
-            gofumpt
-            golangci-lint
-            go-mockery
-            protobuf
-            sqlite
-            go-swag # for generate-openapi
-            addlicense
-            protoc-gen-go
-            protoc-gen-go-grpc
-            gcc
-          ];
-          CFLAGS = "-I${pkgs.glibc.dev}/include";
-          LDFLAGS = "-L${pkgs.glibc}/lib";
-        };
+              # backend
+              go
+              glibc.static
+              gofumpt
+              golangci-lint
+              go-mockery_2
+              protobuf
+              sqlite
+              go-swag # for generate-openapi
+              addlicense
+              protoc-gen-go
+              protoc-gen-go-grpc
+              gcc
+            ];
+            CFLAGS = "-I${pkgs.glibc.dev}/include";
+            LDFLAGS = "-L${pkgs.glibc}/lib";
+            GO = "${go}/bin/go";
+            GOROOT = "${go}/share/go";
+          };
       }
     );
 }