Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tailscale: 1.2.6 -> 1.2.8 #104012

Merged
merged 1 commit into from Nov 21, 2020
Merged

Conversation

danderson
Copy link
Contributor

Signed-off-by: David Anderson dave@natulte.net

Motivation for this change

Upstream patch release with bugfixes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Signed-off-by: David Anderson <dave@natulte.net>
Copy link
Member

@mdlayher mdlayher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

~/src/github.com/nixos/nixpkgs [master|✔] 
12:27 $ nixpkgs-review pr 104012
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/104012/head:refs/nixpkgs-review/1
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Total 6 (delta 4), reused 4 (delta 4), pack-reused 2
Unpacking objects: 100% (6/6), 1.02 KiB | 173.00 KiB/s, done.
From ssh://github.com/NixOS/nixpkgs
   08e6c4d0017..2497a55f5f0  master                -> refs/nixpkgs-review/0
 + 62d6a76324c...168f36153b1 refs/pull/104012/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/matt/.cache/nixpkgs-review/pr-104012/nixpkgs 2497a55f5f064ee47c63327a425ee8326707a752
Preparing worktree (detached HEAD 2497a55f5f0)
HEAD is now at 2497a55f5f0 Merge pull request #101855 from mweinelt/batman-adv
$ git merge --no-commit 168f36153b1e89ff9482398f37ba23825da9bf3e
Automatic merge went well; stopped before committing as requested
$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/matt/.cache/nixpkgs-review/pr-104012/build.nix
[4 built, 31 copied (25.1 MiB), 6.5 MiB DL]
https://github.com/NixOS/nixpkgs/pull/104012
1 package built:
tailscale

$ nix-shell /home/matt/.cache/nixpkgs-review/pr-104012/shell.nix

[nix-shell:~/.cache/nixpkgs-review/pr-104012]$ ./results/tailscale/bin/tailscale version
1.2.8
  tailscale commit: 37adb62a35d818f4af638924d3fc1526bdeaf215
  go version: go1.15.5

@dywedir
Copy link
Member

dywedir commented Nov 21, 2020

Thanks!

@dywedir dywedir merged commit 7f02d02 into NixOS:master Nov 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants