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: 23.12.1 -> 24.04 #302013

Merged
merged 4 commits into from
Apr 23, 2024
Merged

anki: 23.12.1 -> 24.04 #302013

merged 4 commits into from
Apr 23, 2024

Conversation

slotThe
Copy link
Contributor

@slotThe slotThe commented Apr 6, 2024

Description of changes

anki-bin was already taken care of in #300726 so this pr is just for anki.

Commit summary

python3Packages.pip-tools: fix build

  • Adjust the patch, which did not seem to apply correctly.
  • Disable deprecation tests, which trigger a build failure.

Fixes: 6ac2d27

python3Packages.git-versioner: init at 7.1

python3Packages.pip-system-certs: init at 4.0

anki: 23.12.1 -> 24.04

Things done

  • Built on platform(s)

    • x86_64-linux

      $ nix-build ./ -A anki
      /nix/store/r7cbmgvc68ghsrxjb8b9mfaps97v29ln-anki-24.04
    • aarch64-linux

    • x86_64-darwin

    • aarch64-darwin

  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)

    • sandbox = relaxed
    • sandbox = true
  • 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/)

    $ ./result/bin/anki --version
    Preparing to run...
    Anki 24.04

    I've also done my daily review with this version just now, and it seems to work fine for me.

  • 24.05 Release Notes (or backporting 23.05 and 23.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.

@donovanglover
Copy link
Member

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

6 packages marked as broken and skipped:
  • python311Packages.bentoml
  • python311Packages.bentoml.dist
  • python311Packages.openllm
  • python311Packages.openllm.dist
  • python312Packages.bentoml
  • python312Packages.bentoml.dist
1 package failed to build:
  • windmill
19 packages built:
  • anki
  • anki-sync-server
  • anki.dist
  • anki.doc
  • anki.man
  • mnemosyne
  • mnemosyne.dist
  • python311Packages.git-versioner
  • python311Packages.git-versioner.dist
  • python311Packages.pip-system-certs
  • python311Packages.pip-system-certs.dist
  • python311Packages.pip-tools
  • python311Packages.pip-tools.dist
  • python312Packages.git-versioner
  • python312Packages.git-versioner.dist
  • python312Packages.pip-system-certs
  • python312Packages.pip-system-certs.dist
  • python312Packages.pip-tools
  • python312Packages.pip-tools.dist

@donovanglover
Copy link
Member

Relevant error from nix log /nix/store/dn3l8nyfagknfhzy36k6lz1i93zm696n-windmill-1.246.15.drv:

error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
  --> /build/cargo-vendor-dir/rustpython-ast-0.3.0/src/impls.rs:60:1
   |
60 | static_assertions::assert_eq_size!(crate::Stmt, [u8; 160]);
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: source type: `generic::Stmt` (1216 bits)
   = note: target type: `[u8; 160]` (1280 bits)
   = note: this error originates in the macro `static_assertions::assert_eq_size` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
  --> /build/cargo-vendor-dir/rustpython-ast-0.3.0/src/impls.rs:62:1
   |
62 | static_assertions::assert_eq_size!(crate::Pattern, [u8; 96]);
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: source type: `generic::Pattern` (704 bits)
   = note: target type: `[u8; 96]` (768 bits)
   = note: this error originates in the macro `static_assertions::assert_eq_size` (in Nightly builds, run with -Z macro-backtrace for more info)

   Compiling yoke-derive v0.7.3
For more information about this error, try `rustc --explain E0512`.
error: could not compile `rustpython-ast` (lib) due to 2 previous errors

@slotThe
Copy link
Contributor Author

slotThe commented Apr 9, 2024

@donovanglover this seems unrelated to this PR, but looks to be RustPython/Parser#111
Should I just apply that patch?

Copy link
Member

@euank euank left a comment

Choose a reason for hiding this comment

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

I verified the anki binary runs and works fine for my decks!

Thanks for updating it!

The windmill package breakage mentioned above seems unrelated, so it seems like it should be ignored on this PR

Copy link
Member

@donovanglover donovanglover left a comment

Choose a reason for hiding this comment

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

LGTM

+ Adjust the patch, which did not seem to apply correctly.
+ Disable deprecation tests, which trigger a build failure.

Fixes: NixOS@6ac2d27
@wegank
Copy link
Member

wegank commented Apr 12, 2024

@ofborg build anki anki.passthru.tests

@siraben
Copy link
Member

siraben commented Apr 23, 2024

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

6 packages marked as broken and skipped:
  • python311Packages.bentoml
  • python311Packages.bentoml.dist
  • python311Packages.openllm
  • python311Packages.openllm.dist
  • python312Packages.bentoml
  • python312Packages.bentoml.dist
2 packages failed to build:
  • anki-sync-server
  • windmill
18 packages built:
  • anki
  • anki.dist
  • anki.doc
  • anki.man
  • mnemosyne
  • mnemosyne.dist
  • python311Packages.git-versioner
  • python311Packages.git-versioner.dist
  • python311Packages.pip-system-certs
  • python311Packages.pip-system-certs.dist
  • python311Packages.pip-tools
  • python311Packages.pip-tools.dist
  • python312Packages.git-versioner
  • python312Packages.git-versioner.dist
  • python312Packages.pip-system-certs
  • python312Packages.pip-system-certs.dist
  • python312Packages.pip-tools
  • python312Packages.pip-tools.dist

@thiagokokada thiagokokada merged commit b58121a into NixOS:master Apr 23, 2024
24 checks passed
@slotThe slotThe deleted the anki-24.04 branch April 24, 2024 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants