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

Jump to bottom

tailscale: init at 0.97-0 [20.03 backport] #82827

Merged
merged 3 commits into from Mar 23, 2020
Merged

tailscale: init at 0.97-0 [20.03 backport] #82827

merged 3 commits into from Mar 23, 2020

Conversation

danderson
Copy link
Contributor

Motivation for this change

New package+module, just landed in master. The package and module are both leaves, nothing depends on them, so it should be very safe to add.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from kalbasit March 18, 2020 07:09
@danderson danderson mentioned this pull request Mar 18, 2020
Closed
@danderson
Copy link
Contributor Author

cc 20.03 RMs: @worldofpeace @disassembler

Profpatsch
Profpatsch reviewed Mar 22, 2020
View reviewed changes
pkgs/servers/tailscale/default.nix Outdated Show resolved Hide resolved
pkgs/servers/tailscale/default.nix Outdated Show resolved Hide resolved
@Profpatsch Profpatsch mentioned this pull request Mar 22, 2020
Merged
10 tasks
@ofborg ofborg bot requested a review from martinbaillie March 23, 2020 01:54
@worldofpeace
Copy link
Contributor

I can't remember if we had some knowledge on restricting backports of new modules.

worldofpeace
worldofpeace reviewed Mar 23, 2020
View reviewed changes
pkgs/servers/tailscale/default.nix Outdated
Comment on lines 5 to 10
version = "v0.97";

src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v0.97";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
version = "v0.97";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v0.97";
version = "0.97";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";

nixpkgs manual says version shouldn't have that character in it.
Not sure if this commit is on master yet or not?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Woops, adding your suggested change resolved this.

To your other question: the version adjust isn't in master yet. I'll queue up a PR to do that as well. The version+rev change is a no-op on the built binaries though, since the v0.97 tag references the commit hash we used in the initial commit to unstable.

@worldofpeace
Copy link
Contributor

worldofpeace commented Mar 23, 2020 •
edited

I don't really see any reason to prevent this from a technical standpoint, though I would have liked to see more info about the project in the OP, had to iron those details out on IRC.

@worldofpeace
Copy link
Contributor

So I don't really get fixing the version here and then I guess forward porting to master. I guess canonically you should have that commit in master and then backport it.

@danderson
Copy link
Contributor Author

Ack. I'll send a PR to master, then adjust this PR to be purely cherry-picks from master.

worldofpeace
worldofpeace approved these changes Mar 23, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Approving like I did on IRC.

Martin Baillie and others added 3 commits March 23, 2020 12:47
@danderson
tailscale: init at 0.96-33
6ce36ff 
Signed-off-by: Martin Baillie <martin@baillie.email>
(cherry picked from commit 6e055c9)
@danderson
tailscale: 0.96-33 -> 0.97-0.
1fceda4 
Fixes a severe bug with subnet routing.

Signed-off-by: David Anderson <dave@natulte.net>
(cherry picked from commit f61f686)
@danderson
tailscale: switch version and git ref to use a tag.
752d976 
The tag points to the same commit hash, so the binary
is unchanged.

Signed-off-by: David Anderson <dave@natulte.net>
(cherry picked from commit 3fa813e)
@danderson
Copy link
Contributor Author

Updated to only contain cherry-picks from master.

@grahamc grahamc merged commit d76b379 into NixOS:release-20.03 Mar 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Profpatsch Profpatsch Profpatsch approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

@kalbasit kalbasit Awaiting requested review from kalbasit

@martinbaillie martinbaillie Awaiting requested review from martinbaillie

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@danderson @worldofpeace @Profpatsch @grahamc