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

Add/resilio sync #26303

Closed
wants to merge 5 commits into from
Closed

Add/resilio sync #26303

wants to merge 5 commits into from

Conversation

cynic
Copy link

@cynic cynic commented Jun 1, 2017

Motivation for this change

The btsync service and package are no longer supported upstream, and should be replaced by the resilio sync service and package (see issue #19436).

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 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.

(my apologies for the previous pull request against the incorrect branch!)

@Mic92
Copy link
Member

Mic92 commented Jun 1, 2017

I am ok with porting this release-17.03 (as the old service might stop working). However we have the policy to first merge to master and then cherry pick the commits back to the release branch. This particular pull request looks simple enough, that I can do the rebasing and merging in the right order.

@cynic
Copy link
Author

cynic commented Jun 1, 2017

Thanks @Mic92 - I think I missed the last point of the "Making Patches" section (could've sworn I got all of them...). I'll do better next time.

@Mic92
Copy link
Member

Mic92 commented Jun 1, 2017

Did you test the service before hand? It contained some evaluation errors. You can test services as described here: https://github.com/nixos-users/wiki/wiki/nix-command-cookbook#build-nixos-from-nixpkgs-repo

Nevertheless, I made it work on master. Can you confirm whether it also works on 17.03?

@cynic
Copy link
Author

cynic commented Jun 2, 2017

@Mic92 Have tested with nixos-rebuild test -I nixpkgs=/home/cynic/nixpkgs --fast, and seems to work fine on 17.03 with your changes. I can't seem to make it possible to enable/disable per-user, but that's probably my lack of systemd knowledge showing; and it doesn't seem to be a big issue. Thank you.

this used to be part of the upstream btsync package
@Mic92
Copy link
Member

Mic92 commented Jun 2, 2017

in other btsync package was an systemd user service, which was overridden in the nixos module. Since this is no longer the case with resilio-sync, I dropped it.

@Mic92 Mic92 closed this in 3d17573 Jun 2, 2017
Mic92 added a commit that referenced this pull request Jun 2, 2017
this used to be part of the upstream btsync package

fixes #26303

(cherry picked from commit 3d17573)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants