diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-06-07 16:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 16:05:23 +0200 |
| commit | 03dead8787588817de89eee2c5abb996144e8cff (patch) | |
| tree | fad34b90573572974f925dd3e19c198ed5aa1e01 /pkgs/servers | |
| parent | cf979789097c50c801d862a4a72a7fda592fd051 (diff) | |
| parent | e77c586dbc33c9337a6dba4244ba8d83517609a4 (diff) | |
| download | nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar.gz nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar.bz2 nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar.lz nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar.xz nixlib-03dead8787588817de89eee2c5abb996144e8cff.tar.zst nixlib-03dead8787588817de89eee2c5abb996144e8cff.zip | |
Merge pull request #89455 from danderson/master
tailscale: 0.97-219 -> 0.99.1-0
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/tailscale/default.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 9f0a8de4ef68..e61437c46ff6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "tailscale"; - version = "0.97-219"; + # Tailscale uses "git describe" as version numbers. 0.99.1-0 means + # "tag v0.99.1 plus 0 commits", which corresponds to rev="v0.99.1" + # below. + version = "0.99.1-0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - # Tailscale uses "git describe" as version numbers. v0.97-219 - # means "tag v0.97 plus 219 commits", which is what this rev is. - rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339"; - sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68"; + rev = "v0.99.1"; + sha256 = "1kq4x5xknv0qq6n78xj5wjbf6svbdyw4nzs7z5gjb3ylj2vl97pb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,14 +19,7 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - overrideModAttrs = (_: { - preBuild = '' - rm ipn/e2e_test.go - rm control/controlclient/auto_test.go - rm control/controlclient/direct_test.go - ''; - }); - vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; + vendorSha256 = "0yf2zdpd12w4qf4sbv7bkr40hw5faqynr6lb84v7w6v0az0nfzds"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -41,4 +35,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} \ No newline at end of file +} |