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

anki: 2.1.61 -> 2.1.65 #229480

Merged
merged 2 commits into from
Aug 29, 2023
Merged

anki: 2.1.61 -> 2.1.65 #229480

merged 2 commits into from
Aug 29, 2023

Conversation

euank
Copy link
Member

@euank euank commented May 2, 2023

Description of changes

Upstream changelog: https://github.com/ankitects/anki/releases/tag/2.1.65

The item that seems like it might matter to us:

If you are on Linux and don't have ANKI_WAYLAND set, you may need to install
libxcb-cursor or Anki will fail to start. Eg on Debian/Ubuntu:

... I dunno, it starts on my machine using X, so I think it's okay?

The update was pretty straightforward, other than needing to patch the Cargo.lock file to have only one "percent-encoding" dependency. no longer true, that was for 2.1.62, but we've reached 2.1.65 now where the patch is unneeded.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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.

@ofborg ofborg bot requested review from Profpatsch and oxij May 2, 2023 15:31
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 2, 2023
@euank euank changed the title anki: 2.1.61 -> 2.1.62 anki: 2.1.61 -> 2.1.65 Jul 6, 2023
@euank
Copy link
Member Author

euank commented Jul 6, 2023

Updated to 2.1.65, since upstream has had more releases, and it was just bumping hashes pretty much.

@oxij
Copy link
Member

oxij commented Jul 19, 2023

@GrahamcOfBorg build anki

Copy link
Member

@oxij oxij left a comment

Choose a reason for hiding this comment

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

LGTM.

@mohe2015
Copy link
Contributor

mohe2015 commented Aug 8, 2023

Checking the checkboxes at e.g. Tools -> Preferences -> Review didn't work which seems to work for the anki-bin version. Unfortunately I can't investigate and I also don't know if this PR causes that. I may run on wayland and maybe thats related to the issue you mentioned.

@euank
Copy link
Member Author

euank commented Aug 10, 2023

Thanks for the heads up @mohe2015! I appreciate the info.

It's broken for me too, both on nixos-unstable (X + Anki 2.1.61) and with this PR.
Which hey, nice, that means I can reproduce it :D

I think that means it's not related to this PR specifically, but rather the broader package.
As such, I'll look into it separately.

I filed an issue for that: #248357

@euank euank mentioned this pull request Aug 10, 2023
12 tasks
@tjni
Copy link
Contributor

tjni commented Aug 22, 2023

@euank Thank you for initiating this update. I don't use anki and wanted to gauge your confidence in this update.

We merged #248866 into staging, which among other things updated wheel to 0.41.1. I think anki will be broken until ankitects/anki@e20e7f7 is picked up, which was only added in version 2.1.62. I could try to cherry-pick that change onto the current version, but I only want to take that route if we cannot update it.

@mohe2015
Copy link
Contributor

As the issue I found seems unrelated to this PR I think we can still merge it.

@euank
Copy link
Member Author

euank commented Aug 22, 2023

Thanks for the heads up, @tjni, appreciated.

I'm not sure if we'll need to cherry pick that or not.
Since it's related to wheel packaging, I think it's likely that if the package still builds, there's a decent chance it's fine.

It looks like there's not yet a hydra build for those changes on staging, so checking properly would also require recompiling pretty much the entire world, not just anki.
I think I'll wait on hydra to get something built, see if hydra hits an evaluation error for the current 2.1.61 anki package, and then also see if I can check this update with the staging changes.

@tjni
Copy link
Contributor

tjni commented Aug 26, 2023

It took awhile for staging-next to build, and at the time of this writing it's only finished for aarch64-linux, but there does seem to be an error related to wheel:

FAILED: /build/source/out/wheels/aqt-2.1.61-py3-none-any.whl 
/build/source/out/rust/debug/runner run /build/source/out/pyenv/bin/python python/write_wheel.py qt/aqt /build/source/out/qt/_aqt /build/source/out/wheels/aqt-2.1.61-py3-none-any.whl
Command failed: 

Traceback (most recent call last):
  File "/build/source/python/write_wheel.py", line 189, in <module>
    write_wheel(
  File "/build/source/python/write_wheel.py", line 80, in write_wheel
    return write_wheel_file(
  File "/build/source/python/write_wheel.py", line 46, in write_wheel_file
    with ReproducibleWheelFile(filename, "w") as wheel:
  File "/nix/store/hzpbm0zkg61smdwpj42jmp2k5bansrdw-python3-3.10.12/lib/python3.10/zipfile.py", line 1312, in __exit__
    self.close()
  File "/nix/store/h8mzz6lkk0v83ck53541fpq7n7ngl1s1-python3.10-wheel-0.41.1/lib/python3.10/site-packages/wheel/wheelfile.py", line 195, in close
    self.writestr(self.record_path, data.getvalue())
  File "/build/source/python/write_wheel.py", line 18, in writestr
    raise ValueError("ZipInfo required")
ValueError: ZipInfo required
Exception ignored in: <function ZipFile.__del__ at 0xfffff7114e50>
Traceback (most recent call last):
  File "/nix/store/hzpbm0zkg61smdwpj42jmp2k5bansrdw-python3-3.10.12/lib/python3.10/zipfile.py", line 1821, in __del__
    self.close()
  File "/nix/store/h8mzz6lkk0v83ck53541fpq7n7ngl1s1-python3.10-wheel-0.41.1/lib/python3.10/site-packages/wheel/wheelfile.py", line 195, in close
    self.writestr(self.record_path, data.getvalue())
  File "/build/source/python/write_wheel.py", line 18, in writestr
    raise ValueError("ZipInfo required")
ValueError: ZipInfo required

@mohe2015
Copy link
Contributor

Then we should probably merge this sooner than later as this update seems to include that fix and seems to work otherwise too.

Copy link
Contributor

@mohe2015 mohe2015 left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Result of nixpkgs-review pr 229480 run on x86_64-linux 1

6 packages built:
  • anki
  • anki.dist
  • anki.doc
  • anki.man
  • mnemosyne
  • mnemosyne.dist

@euank
Copy link
Member Author

euank commented Aug 29, 2023

In addition to the nixpkgs-review above, I've verified that this PR, when merged into current master, gives a working anki binary.

Since the python update broke the older anki that's on master now, I think that lends more importance to merging this as soon as possible.

@Atemu
Copy link
Member

Atemu commented Aug 29, 2023

In addition to the nixpkgs-review above, I've verified that this PR, when merged into current master, gives a working anki binary.

Note that nixpkgs-review also builds against master by default.

@euank
Copy link
Member Author

euank commented Aug 29, 2023

Yup, I was just trying to say that I also ran the binary too, since nixpkgs-review only verifies the build, not running the application.

@Atemu
Copy link
Member

Atemu commented Aug 29, 2023

Anki builds on Darwin but crashes on startup. Could you set meta.broken = stdenv.isDarwin?

@euank
Copy link
Member Author

euank commented Aug 29, 2023

I've marked it as broken on darwin, thanks for testing that!

@ofborg ofborg bot requested a review from oxij August 29, 2023 13:38
@Atemu Atemu merged commit c680330 into NixOS:master Aug 29, 2023
@Atemu
Copy link
Member

Atemu commented Aug 29, 2023

Btw, 2.1.66 is out but I didn't want to hold this PR off on that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants