Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4f62b02845df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef0d63e76ad0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2020

  1. tailscale: 1.0.5 -> 1.2.1

    @danderson
    danderson committed Nov 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4571671 View commit details

  2. Merge pull request #102686 from danderson/danderson/tailscale-1.2.1 

    tailscale: 1.0.5 -> 1.2.1
    @marsam
    marsam authored Nov 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef0d63e View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/servers/tailscale/default.nix
9 changes: 5 additions & 4 deletions pkgs/servers/tailscale/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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}"
)
'';