summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorDavid Anderson <dave@natulte.net>2020-11-03 17:25:01 -0800
committerDavid Anderson <dave@natulte.net>2020-11-03 17:25:01 -0800
commit4571671de3bde59961313e90c65de70888897ca6 (patch)
tree731431cffbfe421e9d2e2ff6973cea06e65e168e /pkgs/servers
parente84d30d4dd63686e2a8e06b676b88af7ad722cda (diff)
downloadnixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar.gz
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar.bz2
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar.lz
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar.xz
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.tar.zst
nixpkgs-4571671de3bde59961313e90c65de70888897ca6.zip
tailscale: 1.0.5 -> 1.2.1
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/tailscale/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 2e14b0fe7f8..803f166d5dd 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,20 +2,21 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.0.5";
+  version = "1.2.1";
+  tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1`
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b";
+    sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   CGO_ENABLED = 0;
 
-  vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv";
+  vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s";
 
   doCheck = false;
 
@@ -24,7 +25,7 @@ buildGoModule rec {
   preBuild = ''
     export buildFlagsArray=(
       -tags="xversion"
-      -ldflags="-X tailscale.com/version.LONG=${version} -X tailscale.com/version.SHORT=${version}"
+      -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}"
     )
   '';