Skip to content

anki-sync-server: init at 2.1.66#261166

Merged
wegank merged 1 commit into
NixOS:masterfrom
martinetd:anki-sync-server
Nov 30, 2023
Merged

anki-sync-server: init at 2.1.66#261166
wegank merged 1 commit into
NixOS:masterfrom
martinetd:anki-sync-server

Conversation

@martinetd
Copy link
Copy Markdown
Member

@martinetd martinetd commented Oct 15, 2023

Description of changes

anki-sync-server will be used in new ankisyncd module (see #257692)

anki itself was slightly modified to add its cargoLock as passthru so we
can use it for anki-sync-server as it's built from the same sources.

Cc @euank @oxij @paveloom (anki maintainers): I also have an update for anki to 23.10beta6 lined up in https://github.com/martinetd/nixpkgs/commits/anki-sync-server-nixos as they broke the protocol, so will want to update the server as soon as possible. I don't think we should upgrade anki to a beta yet but it might be worth testing; I've only checked it builds and sync appears to work calling the python internal functions directly.... (yay, at last some nixosTest for this monster)
It might make sense to not link anki-sync-server's version with anki's? but then we'd need two separate Cargo.lock files and maintaining the hashes manually for both, that's a bit inefficient; it's probably best to keep in sync as much as possible and just update to 23.10 when it gets released.
Cc @telotortium

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 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.

@martinetd martinetd mentioned this pull request Oct 15, 2023
12 tasks
@ofborg ofborg Bot added the 8.has: package (new) This PR adds a new package label Oct 15, 2023
@ofborg ofborg Bot requested review from euank, oxij and paveloom October 15, 2023 07:33
@ofborg ofborg Bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 15, 2023
Comment thread pkgs/games/anki/sync-server.nix Outdated
Comment thread pkgs/games/anki/sync-server.nix Outdated
Copy link
Copy Markdown
Member

@paveloom paveloom left a comment

Choose a reason for hiding this comment

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

About updating Anki: I'd prefer to wait for a new stable release.

@martinetd
Copy link
Copy Markdown
Member Author

Thanks for the prompt review!

About updating Anki: I'd prefer to wait for a new stable release.

Yes, that's what I suggested (in an edit, sorry if you checked the mail) -- this package already works in 2.1.66, just not with "newer clients", we can update it when 23.10 is out.

@martinetd martinetd force-pushed the anki-sync-server branch 2 times, most recently from b0e24c1 to dd04eff Compare October 15, 2023 08:50
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 15, 2023
@ofborg ofborg Bot requested a review from paveloom October 15, 2023 09:11
Comment thread pkgs/games/anki/sync-server.nix Outdated
Comment thread pkgs/games/anki/sync-server.nix Outdated
Comment thread pkgs/games/anki/sync-server.nix Outdated
Copy link
Copy Markdown
Member Author

@martinetd martinetd left a comment

Choose a reason for hiding this comment

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

Applied changes, thanks!

EDIT: hm, fudged rebase, fixed

Comment thread pkgs/games/anki/sync-server.nix Outdated
Comment thread pkgs/games/anki/sync-server.nix Outdated
@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approvals: 1 This PR was reviewed and approved by one person. and removed 12.approvals: 1 This PR was reviewed and approved by one person. 12.approvals: 2 This PR was reviewed and approved by two persons. labels Oct 16, 2023
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 17, 2023
@h7x4 h7x4 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 19, 2023
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 19, 2023
@martinetd martinetd mentioned this pull request Nov 23, 2023
6 tasks
anki-sync-server will be used in new ankisyncd module.

anki itself was slightly modified to add its cargoLock as passthru so we
can use it for anki-sync-server as it's built from the same sources.

Link: NixOS#257692
Co-authored-by: Pavel Sobolev <paveloom@riseup.net>
Co-authored-by: h7x4 <h7x4@nani.wtf>
@wegank
Copy link
Copy Markdown
Member

wegank commented Nov 30, 2023

@ofborg build anki-sync-server anki-sync-server.passthru.tests

@wegank wegank merged commit 3808ba7 into NixOS:master Nov 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants