From b95df54b0667b2f1953870896dff546209240288 Mon Sep 17 00:00:00 2001
From: Chatnoir Miki <cmiki@amono.me>
Date: Wed, 9 Apr 2025 00:38:48 +0800
Subject: [PATCH] nix: update nix and use go 1.24 (#15578)

Updates #15015

Signed-off-by: Chatnoir Miki <cmiki@amono.me>
---
 flake.lock | 6 +++---
 flake.nix  | 8 ++++----
 go.mod.sri | 2 +-
 shell.nix  | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c4aa7dfc..05b0f303e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,11 +36,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724748588,
-        "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
+        "lastModified": 1743938762,
+        "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99",
+        "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 95d5c3035..2f920bfd4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,14 +68,14 @@
     # you're an end user you should be prepared for this flake to not
     # build periodically.
     tailscale = pkgs:
-      pkgs.buildGo123Module rec {
+      pkgs.buildGo124Module rec {
         name = "tailscale";
 
         src = ./.;
         vendorHash = pkgs.lib.fileContents ./go.mod.sri;
         nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [pkgs.makeWrapper];
         ldflags = ["-X tailscale.com/version.gitCommitStamp=${tailscaleRev}"];
-        CGO_ENABLED = 0;
+        env.CGO_ENABLED = 0;
         subPackages = ["cmd/tailscale" "cmd/tailscaled"];
         doCheck = false;
 
@@ -118,7 +118,7 @@
           gotools
           graphviz
           perl
-          go_1_23
+          go_1_24
           yarn
 
           # qemu and e2fsprogs are needed for natlab
@@ -130,4 +130,4 @@
   in
     flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system);
 }
-# nix-direnv cache busting line: sha256-xO1DuLWi6/lpA9ubA2ZYVJM+CkVNA5IaVGZxX9my0j0=
+# nix-direnv cache busting line: sha256-av4kr09rjNRmag94ziNjJuI/cg8b8lAD3Tk24t/ezH4=
diff --git a/go.mod.sri b/go.mod.sri
index 4abb3c516..6c8357e04 100644
--- a/go.mod.sri
+++ b/go.mod.sri
@@ -1 +1 @@
-sha256-xO1DuLWi6/lpA9ubA2ZYVJM+CkVNA5IaVGZxX9my0j0=
+sha256-av4kr09rjNRmag94ziNjJuI/cg8b8lAD3Tk24t/ezH4=
\ No newline at end of file
diff --git a/shell.nix b/shell.nix
index 4d2e24366..bb8eacb67 100644
--- a/shell.nix
+++ b/shell.nix
@@ -16,4 +16,4 @@
 ) {
   src =  ./.;
 }).shellNix
-# nix-direnv cache busting line: sha256-xO1DuLWi6/lpA9ubA2ZYVJM+CkVNA5IaVGZxX9my0j0=
+# nix-direnv cache busting line: sha256-av4kr09rjNRmag94ziNjJuI/cg8b8lAD3Tk24t/ezH4=