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: 1.2.2 -> 1.3.0 #71037

Merged
merged 1 commit into from Oct 20, 2019
Merged

syncthing: 1.2.2 -> 1.3.0 #71037

merged 1 commit into from Oct 20, 2019

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Oct 12, 2019

Motivation for this change

Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.3.0

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@marsam marsam mentioned this pull request Oct 12, 2019
Merged
10 tasks
andrew-d
andrew-d approved these changes Oct 13, 2019
View reviewed changes
Copy link
Contributor

@andrew-d andrew-d left a comment •
edited

Choose a reason for hiding this comment

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

Changes look reasonable to me - the only real difference upstream appears to be the small vs. large database distinction, which is non-breaking. Thanks!

EDIT: though it appears that you've got a hash mismatch to fix:

hash mismatch in fixed-output derivation '/nix/store/agqaimxlcbpyk06kayfpxbii1rd104s6-syncthing-1.3.0-go-modules':
  wanted: sha256:1349in0mi2zx6ikw6nfir4vmsjk92j0hkw66ryqw8nvv8f51vn18
  got:    sha256:1id94ql2kfn1zb36kwwym3aq4j9h2wjdxb6r6wfwxqq6p5p4xixr

@emmanuelrosa
Copy link
Contributor

Other than having to change the modSha256 (to 065vg57w1swc54l87lhc3z9r2z9jsvma8a5la7pffnwmx65v8jzd), this is working great!

@andrew-d
Copy link
Contributor

I think that #71049 may be the cause of the hash changes here. Once that's merged, hopefully this will be more reproducible.

@ofborg ofborg bot requested a review from andrew-d October 20, 2019 02:26
andrew-d
andrew-d approved these changes Oct 20, 2019
View reviewed changes
Copy link
Contributor

@andrew-d andrew-d left a comment

Choose a reason for hiding this comment

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

Checked out, built locally, and confirmed that the binaries were executable. Looks good to me!

@marsam marsam merged commit 6c909f5 into NixOS:master Oct 20, 2019
@marsam marsam deleted the update-syncthing branch October 20, 2019 10:23
emmanuelrosa added a commit to emmanuelrosa/nixpkgs-overlays that referenced this pull request Oct 23, 2019
@emmanuelrosa
add syncthing 1.3.0
087b6c6 
See NixOS/nixpkgs#71037

NOTE: I had to change the mod256 hash to 065vg57w1swc54l87lhc3z9r2z9jsvma8a5la7pffnwmx65v8jzd
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 approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@jokogr jokogr Awaiting requested review from jokogr

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@marsam @emmanuelrosa @andrew-d