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

nix: use zig2nix to manage nix cache/deps #5439

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

jcollie
Copy link
Collaborator

@jcollie jcollie commented Jan 30, 2025

This brings the internal package more in line with how the nixpkgs package is built. It also handles recursive dependencies better than the current system.

@jcollie jcollie force-pushed the nix-zon2nix branch 2 times, most recently from 0b0bea2 to 603d5f3 Compare January 30, 2025 19:16
@mitchellh
Copy link
Contributor

Going to push this out of 1.1 just due to the diff count and plans to release... now-ish lol.

Copy link
Contributor

@mitchellh mitchellh left a comment

Choose a reason for hiding this comment

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

Thanks! I'm about ready to merge this, I think the only thing we need to do is add build.zig.zon.nix to our .gitattributes file as auto-generated. Its a simple change.

@jcollie
Copy link
Collaborator Author

jcollie commented Feb 11, 2025

Thanks! I'm about ready to merge this, I think the only thing we need to do is add build.zig.zon.nix to our .gitattributes file as auto-generated. Its a simple change.

This file needs to be managed in git as it's the replacement for nix/zigCacheHash.nix

@mitchellh
Copy link
Contributor

I know. I suggested git attributes not git ignore :)

This brings the internal package more in line with how the nixpkgs
package is built. It also handles recursive dependencies better than the
current system.
@mitchellh
Copy link
Contributor

mitchellh commented Feb 11, 2025

I made the change, rebased, and updated for the new gobject deps.

@mitchellh mitchellh merged commit 0532f67 into ghostty-org:main Feb 11, 2025
30 checks passed
@github-actions github-actions bot added this to the 1.1.1 milestone Feb 11, 2025
@jcollie
Copy link
Collaborator Author

jcollie commented Feb 11, 2025

I know. I suggested git attributes not git ignore :)

ah. my bad. reading while in a hurry is bad for one's ego.

@jcollie jcollie deleted the nix-zon2nix branch February 11, 2025 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants