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: fixup #226088 #232439

Merged
merged 1 commit into from
May 17, 2023
Merged

nixos/syncthing: fixup #226088 #232439

merged 1 commit into from
May 17, 2023

Conversation

ncfavier
Copy link
Member

Description of changes

Fixes some oversights from #226088

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ncfavier ncfavier mentioned this pull request May 17, 2023
Merged
12 tasks
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels May 17, 2023
@doronbehar
Copy link
Contributor

@ofborg test syncthing-init

azahi
azahi approved these changes May 17, 2023
View reviewed changes
Copy link
Member

@azahi azahi left a comment

Choose a reason for hiding this comment

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

LGTM, the test passed

@ncfavier
Copy link
Member Author

Added an error if the old shortcuts in folders are used. #207187 would make this nicer.

@ncfavier ncfavier merged commit 10aa44f into NixOS:master May 17, 2023
@ncfavier ncfavier deleted the fix-syncthing branch May 17, 2023 15:03
doronbehar added a commit to doronbehar/nixpkgs that referenced this pull request May 17, 2023
@doronbehar
release-notes: Mention services.syncthing changes due to RFC 42
84d5e9b 
Fixup to NixOS#226088 and NixOS#232439.
This was referenced May 17, 2023
Merged
Merged
@ncfavier ncfavier mentioned this pull request May 22, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azahi azahi azahi approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/`
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ncfavier @doronbehar @azahi