cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #89455 from danderson/master

Browse source 
tailscale: 0.97-219 -> 0.99.1-0
This commit is contained in:
Frederik Rietdijk 2020-06-07 16:05:23 +02:00 committed by GitHub
commit 03dead8787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/servers/tailscale/default.nix
View file

@ -2,15 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tailscale"; 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 { src = fetchFromGitHub {
owner = "tailscale"; owner = "tailscale";
repo = "tailscale"; repo = "tailscale";
# Tailscale uses "git describe" as version numbers. v0.97-219 rev = "v0.99.1";
# means "tag v0.97 plus 219 commits", which is what this rev is. sha256 = "1kq4x5xknv0qq6n78xj5wjbf6svbdyw4nzs7z5gjb3ylj2vl97pb";
rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339";
sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -18,14 +19,7 @@ buildGoModule rec {
CGO_ENABLED = 0; CGO_ENABLED = 0;
goPackagePath = "tailscale.com"; goPackagePath = "tailscale.com";
overrideModAttrs = (_: { vendorSha256 = "0yf2zdpd12w4qf4sbv7bkr40hw5faqynr6lb84v7w6v0az0nfzds";
preBuild = ''
rm ipn/e2e_test.go
rm control/controlclient/auto_test.go
rm control/controlclient/direct_test.go
'';
});
vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl";
subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ];
postInstall = '' postInstall = ''