Skip to content

Commit d0a6324

Browse files
authored
nix: add script to update flake vendor hash (#65)
1 parent 0d1e616 commit d0a6324

File tree

5 files changed

+97
-67
lines changed

5 files changed

+97
-67
lines changed

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ The equivalent using the pre-built docker image:
2828
If you receive the docker error `unable to open database file: out of memory (14)`,
2929
use a persistent volume as documented in [Running in production](#running-in-production).
3030

31+
### Updating Dependencies
32+
33+
After updating dependencies and making changes to `go.mod` and `go.sum`, `flake.nix` needs
34+
to be updated to reflect the new SHA256 of the go dependencies. This can be done by running:
35+
36+
```bash
37+
./update-flake.sh
38+
```
39+
3140
## Joining a tailnet
3241

3342
Create an [auth key] for your tailnet at <https://login.tailscale.com/admin/settings/keys>.
@@ -131,7 +140,7 @@ You can also resolve links locally using a snapshot file:
131140
## Firefox configuration
132141

133142
If you're using Firefox, you might want to configure two options to make it easy to load links:
134-
143+
135144
* to prevent `go/` page loads from the address bar being treated as searches,
136145
navigate to `about:config` and add a boolean setting `browser.fixup.domainwhitelist.go`
137146
with a value of _true_

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
version = golinkVersion;
3030
src = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
3131

32-
vendorSha256 = "sha256-uho3VxVpCmHBVg6zcB+HhiplG7qfl6iJxMacRnzAR/0=";
32+
vendorSha256 = "sha256-ZTyFOoQ6XeQIv1QbpiaPqPhhuFjaS2dgyLiY8nhSurU="; # SHA based on vendoring go.mod
3333
};
3434
};
3535
}

go.mod

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ require (
77
modernc.org/sqlite v1.19.4
88
// Always use a pseudo-version for the tailscale.com module, or else
99
// go's version selection causes problems when pulling golink into corp.
10-
tailscale.com v1.1.1-0.20230104185526-c5ef9103d92b
10+
tailscale.com v1.36.2
1111
)
1212

1313
require (
1414
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
1515
github.com/Microsoft/go-winio v0.6.0 // indirect
1616
github.com/akutz/memconn v0.1.0 // indirect
1717
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
18-
github.com/aws/aws-sdk-go-v2 v1.11.2 // indirect
18+
github.com/aws/aws-sdk-go-v2 v1.17.3 // indirect
1919
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
2020
github.com/aws/aws-sdk-go-v2/credentials v1.6.4 // indirect
2121
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.8.2 // indirect
22-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.2 // indirect
23-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.2 // indirect
22+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
23+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
2424
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.2 // indirect
2525
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.5.2 // indirect
26-
github.com/aws/aws-sdk-go-v2/service/ssm v1.17.1 // indirect
26+
github.com/aws/aws-sdk-go-v2/service/ssm v1.35.0 // indirect
2727
github.com/aws/aws-sdk-go-v2/service/sso v1.6.2 // indirect
2828
github.com/aws/aws-sdk-go-v2/service/sts v1.11.1 // indirect
29-
github.com/aws/smithy-go v1.9.0 // indirect
29+
github.com/aws/smithy-go v1.13.5 // indirect
3030
github.com/coreos/go-iptables v0.6.0 // indirect
3131
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
3232
github.com/go-ole/go-ole v1.2.6 // indirect
@@ -36,9 +36,9 @@ require (
3636
github.com/google/uuid v1.3.0 // indirect
3737
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
3838
github.com/illarion/gonotify v1.0.1 // indirect
39-
github.com/insomniacslk/dhcp v0.0.0-20211209223715-7d93572ebe8e // indirect
39+
github.com/insomniacslk/dhcp v0.0.0-20221215072855-de60144f33f8 // indirect
4040
github.com/jmespath/go-jmespath v0.4.0 // indirect
41-
github.com/josharian/native v1.0.0 // indirect
41+
github.com/josharian/native v1.0.1-0.20221213033349-c1e37c09b531 // indirect
4242
github.com/jsimonetti/rtnetlink v1.1.2-0.20220408201609-d380b505068b // indirect
4343
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
4444
github.com/klauspost/compress v1.15.4 // indirect
@@ -55,27 +55,27 @@ require (
5555
github.com/tailscale/golang-x-crypto v0.0.0-20221102133106-bc99ab8c2d17 // indirect
5656
github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect
5757
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
58+
github.com/tailscale/wireguard-go v0.0.0-20221219190806-4fa124729667 // indirect
5859
github.com/tcnksm/go-httpstat v0.2.0 // indirect
59-
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
60+
github.com/u-root/uio v0.0.0-20221213070652-c3537552635f // indirect
6061
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54 // indirect
6162
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
6263
github.com/x448/float16 v0.8.4 // indirect
6364
go4.org/mem v0.0.0-20210711025021-927187094b94 // indirect
6465
go4.org/netipx v0.0.0-20220725152314-7e7bdc8411bf // indirect
65-
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
66-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
67-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
68-
golang.org/x/net v0.1.0 // indirect
69-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
70-
golang.org/x/sys v0.3.1-0.20221220025402-2204b6615fb8 // indirect
71-
golang.org/x/term v0.1.0 // indirect
72-
golang.org/x/text v0.4.0 // indirect
73-
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
74-
golang.org/x/tools v0.1.12 // indirect
75-
golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
76-
golang.zx2c4.com/wireguard v0.0.0-20220920152132-bb719d3a6e2c // indirect
66+
golang.org/x/crypto v0.3.0 // indirect
67+
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
68+
golang.org/x/mod v0.6.0 // indirect
69+
golang.org/x/net v0.5.0 // indirect
70+
golang.org/x/sync v0.1.0 // indirect
71+
golang.org/x/sys v0.4.0 // indirect
72+
golang.org/x/term v0.4.0 // indirect
73+
golang.org/x/text v0.6.0 // indirect
74+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
75+
golang.org/x/tools v0.2.0 // indirect
76+
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
7777
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
78-
gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5 // indirect
78+
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 // indirect
7979
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
8080
lukechampine.com/uint128 v1.2.0 // indirect
8181
modernc.org/cc/v3 v3.40.0 // indirect

0 commit comments

Comments
 (0)