Skip to content

update flake inputs#330

Merged
flokli merged 5 commits into
nix-community:mainfrom
tpwrules:pr/nixpkgs-update
Aug 10, 2025
Merged

update flake inputs#330
flokli merged 5 commits into
nix-community:mainfrom
tpwrules:pr/nixpkgs-update

Conversation

@tpwrules
Copy link
Copy Markdown
Collaborator

@tpwrules tpwrules commented Aug 9, 2025

Brings us to the latest and greatest nixos-unstable.

Tested that the installer boots; had to fix it up a bit.

Also had to reformat now that nix-fmt has updated.

@tpwrules tpwrules requested a review from flokli August 9, 2025 16:26
@tpwrules
Copy link
Copy Markdown
Collaborator Author

tpwrules commented Aug 9, 2025

@normalcea please give this a look, inexplicably unable to request a review from you. Will address your PR after.

@ghost
Copy link
Copy Markdown

ghost commented Aug 9, 2025

nitpick: "nix-fmt 1.0.0" → "nixfmt 1.0.0"

This package is named nixfmt (1.0.0) and there is no hyphen between nix and fmt.

thought: Next steps

Well-needed update considering how many components have now been up-streamed into nixpkgs, whose patches have been sitting on my branches for a while now. I don't have any blocking comments on the changes listed here.

(iso-configuration/default.nix L3)

# in the future we will just use the standard NixOS iso

I think the next focus should be on building a standard graphical installer closely matching the one with upstream (or re-using upstreams with asahi specific modifications like disabling calamares), this would improve testing and put us closer to upstream.

@ghost
Copy link
Copy Markdown

ghost commented Aug 9, 2025

Addendum: Next steps

Also, we should focus on revisiting the issue trackers and closing issues that are now either gone stale or are fixed now or implementing fixes for those issues.

Copy link
Copy Markdown
Member

@flokli flokli left a comment

Choose a reason for hiding this comment

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

LGTM. Would also like to see the commit message reword to happen, but let's reserve the rest for a discussion / issue.

@tpwrules tpwrules force-pushed the pr/nixpkgs-update branch from a69b91e to 0ed5038 Compare August 9, 2025 21:39
Default upstream since nixpkgs PR#421082. Disabling it is necessary so
that `iwctl` will work properly and not conflict with its
`wpa_supplicant`.

Also finally give the user the right WiFi instructions on login.
@tpwrules tpwrules force-pushed the pr/nixpkgs-update branch from 0ed5038 to 36eb2bb Compare August 9, 2025 21:40
@tpwrules tpwrules requested a review from flokli August 9, 2025 21:40
@ghost
Copy link
Copy Markdown

ghost commented Aug 9, 2025

No more comments on the diff:

Another note: Mesa 25.2 is currently in the process of merging into nixos-unstable. According to the 6.16 progress report, the Asahi team now have a fully upstream graphics stack so we should revisit #303 once it's there and update inputs accordingly.

@flokli
Copy link
Copy Markdown
Member

flokli commented Aug 10, 2025

@normalcea thanks for the heads-up, but this is not the right place to discuss it. Please comment on #303.

@flokli flokli merged commit b5c1059 into nix-community:main Aug 10, 2025
@tpwrules tpwrules deleted the pr/nixpkgs-update branch August 10, 2025 14:49
@tpwrules tpwrules mentioned this pull request Aug 10, 2025
@flokli flokli mentioned this pull request Aug 10, 2025
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