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/tinc: Fix tinc cli wrapper for tinc 1.0 #29479

Merged
merged 1 commit into from Sep 17, 2017
Merged

nixos/tinc: Fix tinc cli wrapper for tinc 1.0 #29479

merged 1 commit into from Sep 17, 2017

Conversation

florianjacob
Copy link
Contributor

tinc 1.0 only has the tincd executable, while tinc 1.1 has tinc.

Motivation for this change

When using stable tinc instead of the (default) pre-release, the nixos/tinc module currently breaks on master as well as the 17.09 branch. I try to fix that with this patch. The issue was introduced in 0051247

@volth Could you take a look?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@florianjacob
Copy link
Contributor Author

You're right, both of your ideas are definitely better that what I did.

But I'm not sure which to prefer…

@florianjacob florianjacob force-pushed the fix-tinc-stable branch 2 times, most recently from e0e9523 to 727b438 Compare September 17, 2017 08:35
@florianjacob
nixos/tinc: Fix tinc cli wrapper for tinc 1.0.
8cea87c 
tinc prior to 1.1 doesn't have the `tinc` executable,
and `tincd` isn't of any use while the daemon already runs.
@florianjacob
Copy link
Contributor Author

@volth Pushed a new version. Based on versionAtLeast 1.1pre (learned that 1.1 > 1.1pre15), I don't generate the wrapper at all for tinc 1.0, as I cant see any use for tincd when the service is already running.

@joachifm joachifm added this to the 17.09 milestone Sep 17, 2017
@joachifm joachifm merged commit 1493074 into NixOS:master Sep 17, 2017
@florianjacob florianjacob deleted the fix-tinc-stable branch September 17, 2017 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos
Projects
None yet
Milestone
17.09
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@florianjacob @joachifm