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/syncthing: move configuration to condigDir #47526

Merged
merged 1 commit into from Nov 2, 2018
Merged

nixos/syncthing: move configuration to condigDir #47526

merged 1 commit into from Nov 2, 2018

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Sep 29, 2018

Motivation for this change

Fix #47513

Things done

@bjornfor
Copy link
Contributor

Would you mind adding a ref to "syncthing/syncthing#3434 (comment)" (or the issue itself) in the commit message?

@bjornfor
Copy link
Contributor

bjornfor commented Oct 1, 2018

Hm, is this too late to target 18.09? (Currently this PR updates 18.09 release notes.) I personally wouldn't mind seeing it land in 18.09, but it is short notice :-)

@bjornfor
Copy link
Contributor

bjornfor commented Oct 1, 2018

On the other hand, the change is behind a "stateVersion >= 18.09" flag. +1 to merge now.

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 1, 2018

@bjornfor done. Thank you.

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 8, 2018

I moved the check to 19.03 for obvious reasons.

@joachifm
Copy link
Contributor

Needs rebasing

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 15, 2018

@joachifm done.

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Nov 2, 2018

ping

@joachifm joachifm merged commit 2dc0fc6 into NixOS:master Nov 2, 2018
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Nov 2, 2018

Thank you all!

@bjornfor
Copy link
Contributor

bjornfor commented Nov 2, 2018

Thanks!

lopsided98
lopsided98 reviewed Nov 5, 2018
View reviewed changes
nixos/doc/manual/release-notes/rl-1903.xml
@@ -97,6 +97,16 @@
start org.nixos.nix-daemon</command>.
</para>
</listitem>
<listitem>
<para>
The Syncthing state and configuration data has been moved from
Copy link
Contributor

@lopsided98 lopsided98 Nov 5, 2018 •
edited

Choose a reason for hiding this comment

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

@rnhmjoj This changelog entry was placed under the Nix 2.0 list, rather that the top level backwards incompatibilities list. It is easy to see the mistake rendered here: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.manualHTML.x86_64-linux/latest/download-by-type/doc/manual/release-notes.html#sec-release-19.03-incompatibilities

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, thank you. I'll make a PR to fix this soon.

@rnhmjoj rnhmjoj mentioned this pull request Nov 7, 2018
Merged
2 tasks
@rnhmjoj rnhmjoj deleted the syncthing branch February 23, 2019 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lopsided98 lopsided98 lopsided98 left review comments

@bjornfor bjornfor bjornfor approved these changes

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

Successfully merging this pull request may close these issues.

None yet
7 participants
@rnhmjoj @bjornfor @joachifm @siers @sjau @lopsided98 @GrahamcOfBorg