mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-31 16:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

flake.nix: update Nix to use tailscale/go 1.25.2 (#17500)

Browse Source 
Update Nix flake to use go 1.25.2
Create the hash from the toolchain rev file automatically from
update-flake.sh

Updates tailscale/go#135

Signed-off-by: Mike O'Driscoll <mikeo@tailscale.com>
This commit is contained in:
Mike O'Driscoll 2025-10-08 14:37:47 -04:00 committed by GitHub
parent b7fe1cea9f
commit 7edb5b7d43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -46,9 +46,9 @@
systems, systems,
flake-compat, flake-compat,
}: let }: let
goVersion = "1.25.1"; goVersion = nixpkgs.lib.fileContents ./go.toolchain.version;
toolChainRev = nixpkgs.lib.fileContents ./go.toolchain.rev; toolChainRev = nixpkgs.lib.fileContents ./go.toolchain.rev;
gitHash = "sha256-1OCmJ7sZL6G/6wO2+lnW4uYPCIdbXhscD5qSTIPoxDk="; gitHash = nixpkgs.lib.fileContents ./go.toolchain.rev.sri;
eachSystem = f: eachSystem = f:
nixpkgs.lib.genAttrs (import systems) (system: nixpkgs.lib.genAttrs (import systems) (system:
f (import nixpkgs { f (import nixpkgs {
@ -61,7 +61,7 @@
owner = "tailscale"; owner = "tailscale";
repo = "go"; repo = "go";
rev = toolChainRev; rev = toolChainRev;
hash = gitHash; sha256 = gitHash;
}; };
}; };
}) })

1
go.toolchain.rev.sri Normal file
View File

@ -0,0 +1 @@
sha256-1OCmJ7sZL6G/6wO2+lnW4uYPCIdbXhscD5qSTIPoxDk=

1
go.toolchain.version Normal file
View File

@ -0,0 +1 @@
1.25.2

6
pull-toolchain.sh
View File

@ -11,6 +11,10 @@ if [ "$upstream" != "$current" ]; then
echo "$upstream" >go.toolchain.rev echo "$upstream" >go.toolchain.rev
fi fi
if [ -n "$(git diff-index --name-only HEAD -- go.toolchain.rev)" ]; then ./tool/go version 2>/dev/null | awk '{print $3}' | sed 's/^go//' > go.toolchain.version
./update-flake.sh
if [ -n "$(git diff-index --name-only HEAD -- go.toolchain.rev go.toolchain.rev.sri go.toolchain.version)" ]; then
echo "pull-toolchain.sh: changes imported. Use git commit to make them permanent." >&2 echo "pull-toolchain.sh: changes imported. Use git commit to make them permanent." >&2
fi fi

8
update-flake.sh
View File

@ -10,6 +10,14 @@ rm -rf "$OUT"
./tool/go run tailscale.com/cmd/nardump --sri "$OUT" >go.mod.sri ./tool/go run tailscale.com/cmd/nardump --sri "$OUT" >go.mod.sri
rm -rf "$OUT" rm -rf "$OUT"
GOOUT=$(mktemp -d -t gocross-XXXXXX)
GOREV=$(xargs < ./go.toolchain.rev)
TARBALL="$GOOUT/go-$GOREV.tar.gz"
curl -Ls -o "$TARBALL" "https://github.com/tailscale/go/archive/$GOREV.tar.gz"
tar -xzf "$TARBALL" -C "$GOOUT"
./tool/go run tailscale.com/cmd/nardump --sri "$GOOUT/go-$GOREV" > go.toolchain.rev.sri
rm -rf "$GOOUT"
# nix-direnv only watches the top-level nix file for changes. As a # nix-direnv only watches the top-level nix file for changes. As a
# result, when we change a referenced SRI file, we have to cause some # result, when we change a referenced SRI file, we have to cause some
# change to shell.nix and flake.nix as well, so that nix-direnv # change to shell.nix and flake.nix as well, so that nix-direnv