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

helix: 22.12 -> 23.03 #224062

Closed
wants to merge 2 commits into from
Closed

helix: 22.12 -> 23.03 #224062

wants to merge 2 commits into from

Conversation

isti115
Copy link
Contributor

@isti115 isti115 commented Mar 31, 2023

Description of changes

https://github.com/helix-editor/helix/blob/master/CHANGELOG.md#2303-2023-03-31

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
  • Fits CONTRIBUTING.md.

@isti115
Copy link
Contributor Author

isti115 commented Mar 31, 2023

@ilian (also @cigrainger) I see that you've requested this in #224054, could you please test this PR and verify that it's working correctly? (You can use nixpkgs-review pr 224062.)

Copy link
Member

@ilian ilian left a comment

Choose a reason for hiding this comment

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

Thanks for creating a PR.
The build is failing with ERROR: The Cargo.lock contains git dependencies.
You can find more info on the CI log of ofborg here.

@cigrainger
Copy link
Contributor

Thanks for creating a PR.
The build is failing with ERROR: The Cargo.lock contains git dependencies.
You can find more info on the CI log of ofborg here.

Yep, same here.

@the-mikedavis
Copy link
Contributor

the-mikedavis commented Mar 31, 2023

See helix-editor/helix#6218, we pinned our dependency on tree-sitter to master. Ignoring the git patch and using the latest published version on crates.io should be fine though, it shouldn't cause any compilation errors (just some slightly slower runtime behavior)

@james-atkins
Copy link
Contributor

james-atkins commented Apr 2, 2023

I've added the hash of the tree-sitter master branch to the cargoLock.outputHashes attribute and it works okay. For a git dependency you have to use the lock file directly and remove the cargo hash.

See my derivation for helix here: https://github.com/james-atkins/dotfiles/blob/3b4eb9a3851894e7023cede799170762ff9bf1f9/pkgs/helix/default.nix#L15

@leona-ya leona-ya mentioned this pull request Apr 2, 2023
12 tasks
@charles-dyfis-net
Copy link
Contributor

@isti115, do you intend to update this as described above, or should someone else pick up the mantle?

@isti115
Copy link
Contributor Author

isti115 commented Apr 3, 2023

@charles-dyfis-net Thanks for the ping, I have somehow missed the latest comment.
@james-atkins I've adapted your commit for this branch, thanks for the correction!

@charles-dyfis-net
Copy link
Contributor

As amended, I'm now able to build and run this successfully on aarch64-darwin.

One thing that's a little odd is that running hx --health complains Runtime directory does not exist: /nix/store/...-helix-23.03/bin/runtime -- but since the wrapper setting HELIX_RUNTIME is pointing at the right place (and does get found/used), I assume that's built-in behavior to support running from a source tree and harmless.

@happysalada
Copy link
Contributor

@GrahamcOfBorg eval

@happysalada
Copy link
Contributor

somehow ci is still failing, trying to restart it.

@leona-ya
Copy link
Member

leona-ya commented Apr 3, 2023

We should probably use Cargo.lock as in #224397, as mentioned here https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo. We could either use the mentioned PR I made yesterday or add the changes here.

@happysalada
Copy link
Contributor

Oh right this one is not going to work because of IFD, your PR js probably best then

@happysalada
Copy link
Contributor

I've merged the other one as we went through the same process there (in the interest of speed of release and for additional testing)
Feel free to check, there is an explanation as to why the current approach doesn't work.

@happysalada happysalada closed this Apr 3, 2023
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.

8 participants