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

syncthing-relay module: init #50499

Merged
merged 1 commit into from Nov 20, 2018
Merged

syncthing-relay module: init #50499

merged 1 commit into from Nov 20, 2018

Conversation

delroth
Copy link
Contributor

@delroth delroth commented Nov 17, 2018

Motivation for this change

Adds a new NixOS module for the Syncthing relay server, used to improve Syncthing connectivity for users behind NATed or firewalled networks.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@delroth
Copy link
Contributor Author

delroth commented Nov 17, 2018

Thanks for the quick round of review! Addressed your comments, PTAL.

@samueldr
Copy link
Member

Oh, I like how you have a test here.

@GrahamcOfBorg test syncthing-relay

@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@samueldr
Copy link
Member

Hmmm, looks like the test infra still has the issue. Sorry for the amount of messages.

@GrahamcOfBorg build nixosTests.syncthing-relay

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nixosTests.syncthing-relay

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 15.86s
cleaning up
killing machine (pid 631)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/ka2ilz37f9710qj54wqh26qz8q26zx26-vm-test-run-syncthing-relay

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nixosTests.syncthing-relay

Partial log (click to expand)

machine: exit status 1
syncing
machine: running command: sync
machine: exit status 0
test script finished in 157.94s
cleaning up
killing machine (pid 600)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/6pqa87qrj0pdd8azfyyn4rbcjkl7zkpb-vm-test-run-syncthing-relay

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: nixosTests.syncthing-relay

Partial log (click to expand)

while evaluating the attribute 'linux_4_14' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:14356:3:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:108:35, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:14356:16:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:67:24, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:112:8:
while evaluating anonymous function at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/linux-4.14.nix:1:1, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:69:12:
while evaluating 'buildLinux' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:14654:16, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/linux-4.14.nix:5:1:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:108:35, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:14654:23:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:67:24, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:112:8:
while evaluating anonymous function at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:1:1, called from /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:69:12:
assertion failed at /private/var/lib/ofborg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel/generic.nix:51:1

@samueldr samueldr merged commit a041dc8 into NixOS:master Nov 20, 2018
delroth added a commit to delroth/infra.delroth.net that referenced this pull request Nov 20, 2018
@delroth
syncthing-relay: remove custom service, now upstreamed in NixOS/nixpk…
36aaf0b 
…gs#50499
delroth added a commit to delroth/infra.delroth.net that referenced this pull request Nov 21, 2018
@delroth
syncthing-relay: remove custom service, now upstreamed in NixOS/nixpk…
78d9270 
…gs#50499
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrew-d andrew-d andrew-d left review comments

@infinisil infinisil infinisil approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@delroth @samueldr @GrahamcOfBorg @andrew-d @infinisil