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.

Sign up for GitHub

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

nixos/modules/tailscale: add package as an option #104785

Merged
merged 1 commit into from Dec 1, 2020
Merged

nixos/modules/tailscale: add package as an option #104785

merged 1 commit into from Dec 1, 2020

Conversation

Xe
Copy link
Contributor

@Xe Xe commented Nov 24, 2020

Motivation for this change

This simplifies testing changes to the tailscale service on a local machine. You can use this as such:

let
  tailscale_patched = magic {};
in {
  services.tailscale = {
    enable = true;
    package = tailscale_patched;
  };
};

The default configuration uses the tailscale package, as it does currently.

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.

vikanezrimaya
vikanezrimaya approved these changes Nov 24, 2020
View reviewed changes
Copy link
Member

@vikanezrimaya vikanezrimaya left a comment

Choose a reason for hiding this comment

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

LGTM. Why don't we have this for every service by default, I wonder? 😺

danderson
danderson approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@danderson danderson left a comment

Choose a reason for hiding this comment

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

LGTM, but you'll need to fix your editor settings to appease CI. Thanks!

@Xe @andir
nixos/tailscale: add package as an option
3d55480 
This simplifies testing changes to the tailscale service on a local
machine. You can use this as such:

```nix
let
  tailscale_patched = magic {};
in {
  services.tailscale = {
    enable = true;
    package = tailscale_patched;
  };
};
```

Signed-off-by: Christine Dodrill <me@christine.website>
andir
andir approved these changes Dec 1, 2020
View reviewed changes
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

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

I removed the empty commit and fixed up the editor config changes. The changes look good and I wish we had that for every single module in nixos.

@andir andir merged commit 96663ea into NixOS:master Dec 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danderson danderson danderson approved these changes

@andir andir andir approved these changes

@vikanezrimaya vikanezrimaya vikanezrimaya approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@Xe @danderson @andir @vikanezrimaya