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

zee: fix for rust 1.65 #204862

Merged
merged 1 commit into from
Dec 7, 2022
Merged

zee: fix for rust 1.65 #204862

merged 1 commit into from
Dec 7, 2022

Conversation

tjni
Copy link
Contributor

@tjni tjni commented Dec 6, 2022

Description of changes

This broke when Rust upgraded in #199664. This was fixed upstream in zee-editor/zee@a1d6913 by updating ropey, but that patch leads to merge conflicts and cannot be pulled directly. New release is requested in zee-editor/zee#92, but, in the meantime, I've created a patch locally that updates just ropey and str_indices.

For more context, the issue was reported in cessen/ropey#56 and due to a change introduced in rust-lang/rust#94075.

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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@figsoda figsoda merged commit e13bb8d into NixOS:master Dec 7, 2022
@tjni tjni deleted the zee branch December 8, 2022 00:04
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

2 participants