TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 11:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix: update nix and use go 1.24 (#15578)

Browse Source 
Updates #15015

Signed-off-by: Chatnoir Miki <cmiki@amono.me>
This commit is contained in:
Chatnoir Miki 2025-04-09 00:38:48 +08:00 committed by GitHub
parent 5ed53c7e39
commit b95df54b06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@ -36,11 +36,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1724748588, "lastModified": 1743938762,
"narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -68,14 +68,14 @@
# you're an end user you should be prepared for this flake to not # you're an end user you should be prepared for this flake to not
# build periodically. # build periodically.
tailscale = pkgs: tailscale = pkgs:
pkgs.buildGo123Module rec { pkgs.buildGo124Module rec {
name = "tailscale"; name = "tailscale";
src = ./.; src = ./.;
vendorHash = pkgs.lib.fileContents ./go.mod.sri; vendorHash = pkgs.lib.fileContents ./go.mod.sri;
nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [pkgs.makeWrapper]; nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [pkgs.makeWrapper];
ldflags = ["-X tailscale.com/version.gitCommitStamp=${tailscaleRev}"]; ldflags = ["-X tailscale.com/version.gitCommitStamp=${tailscaleRev}"];
CGO_ENABLED = 0; env.CGO_ENABLED = 0;
subPackages = ["cmd/tailscale" "cmd/tailscaled"]; subPackages = ["cmd/tailscale" "cmd/tailscaled"];
doCheck = false; doCheck = false;
@ -118,7 +118,7 @@
gotools gotools
graphviz graphviz
perl perl
go_1_23 go_1_24
yarn yarn
# qemu and e2fsprogs are needed for natlab # qemu and e2fsprogs are needed for natlab
@ -130,4 +130,4 @@
in in
flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system); 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=

2
go.mod.sri
View File

@ -1 +1 @@
sha256-xO1DuLWi6/lpA9ubA2ZYVJM+CkVNA5IaVGZxX9my0j0= sha256-av4kr09rjNRmag94ziNjJuI/cg8b8lAD3Tk24t/ezH4=

2
shell.nix
View File

@ -16,4 +16,4 @@
) { ) {
src = ./.; src = ./.;
}).shellNix }).shellNix
# nix-direnv cache busting line: sha256-xO1DuLWi6/lpA9ubA2ZYVJM+CkVNA5IaVGZxX9my0j0= # nix-direnv cache busting line: sha256-av4kr09rjNRmag94ziNjJuI/cg8b8lAD3Tk24t/ezH4=