Skip to content

Nix flake#1244

Merged
bates64 merged 1 commit intomainfrom
nix-flake
Aug 24, 2025
Merged

Nix flake#1244
bates64 merged 1 commit intomainfrom
nix-flake

Conversation

@bates64
Copy link
Copy Markdown
Member

@bates64 bates64 commented Aug 13, 2025

  • shell.nix is now flake.nix
    • use nix develop instead of nix-shell
  • ELFs can be built with nix build .#papermario_us (or any other verison)
  • Default development shell requires all baseroms
  • Uses dream2nix to handle Python dependencies, instead of every nix develop doing pip install which was awful

@ethteck
Copy link
Copy Markdown
Member

ethteck commented Aug 15, 2025

It'd be nice to have the issues not related to nix in a different PR because there's already a lot going on with the nix-related changes

@bates64
Copy link
Copy Markdown
Member Author

bates64 commented Aug 15, 2025

You mean the 12 additions in 6d6f523?

@ethteck
Copy link
Copy Markdown
Member

ethteck commented Aug 15, 2025

those, and I guess I was expecting a PR that updates nix files to only touch nix files. I'm not a big fan of moving requirements into tools/configure, as it's the requirements for the whole project (both build time and extraction time), rather than the requirements for that script specifically. also, some of the changes to configure seem unrelated as well

@bates64
Copy link
Copy Markdown
Member Author

bates64 commented Aug 15, 2025

The configure changes are required, e.g. passing CLFAGS as an environment variable is needed for the libpapermario package. We should be following this anyway.

I don't know how else you solve the unpinned dependency problem without making configure into a pyproject. Are there any actual downsides?

Copy link
Copy Markdown
Member

@ethteck ethteck left a comment

Choose a reason for hiding this comment

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

from our discord convo, theez

Comment thread tools/configure/src/configure/main.py Outdated
Comment thread tools/configure/src/configure/main.py Outdated
@BowserSlug
Copy link
Copy Markdown
Collaborator

🚀🚀🚀🚀 This PR matches 4 functions (+0.00%) on us.
🚀🚀🚀🚀 This PR matches 4 functions (+0.00%) on jp.
🚀🚀🚀🚀🚀🚀🚀🚀🚀🚀 This PR matches 10 functions (+0.00%) on ique.
🚀🚀🚀🚀 This PR matches 4 functions (+0.00%) on pal.

@bates64 bates64 enabled auto-merge (squash) August 15, 2025 17:00
@bates64 bates64 requested a review from ethteck August 15, 2025 17:00
Copy link
Copy Markdown
Member

@ethteck ethteck left a comment

Choose a reason for hiding this comment

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

looks grood, but the configure script seems to be failing the black check

@bates64 bates64 requested a review from ethteck August 23, 2025 17:28
@bates64 bates64 force-pushed the nix-flake branch 3 times, most recently from e8d6117 to 5ccf305 Compare August 24, 2025 09:41
- `shell.nix` is now `flake.nix`
  - use `nix develop` instead of `nix-shell`
- ELFs can be built with `nix build .#papermario_us` (or any other verison)
- Default development shell requires all baseroms
- Uses dream2nix to handle Python dependencies, instead of every `nix develop` doing `pip install` which was awful
@bates64 bates64 merged commit bd7a896 into main Aug 24, 2025
3 checks passed
@bates64 bates64 deleted the nix-flake branch August 24, 2025 10:20
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.

3 participants