Skip to content

Conversation

@nmouha
Copy link
Contributor

@nmouha nmouha commented Aug 6, 2025

Description of changes

This reverts #1358 (framework/13-inch/intel-core-ultra-series1: fix intel_vpu firmware error -2).

The firmware is now upstreamed to linux-firmware (https://web.git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=9b870dde196d030a6c8872e8965dd28a0146c990), so #1358 is no longer needed.

Right now, there is no impact to my proposed change (all this does is avoid downloading a file twice). However, it is better to use the upstreamed version in case the firmware gets updated in the future.

Things done
  • Tested the changes in your own NixOS Configuration
  • Tested the changes end-to-end by using your fork of nixos-hardware and
    importing it via <nixos-hardware> or Flake input

Comment on lines 40 to 42
warnings = lib.mkIf (!config.hardware.enableRedistributableFirmware) [
''For Intel NPU support, set the option: hardware.enableRedistributableFirmware = true;''
];
Copy link
Member

Choose a reason for hiding this comment

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

This is still needed I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think the warning is needed. I am suggesting to remove the warning for two reasons:

Note that enableRedistributableFirmware will still work as expected: if set to false, nixpkgs will not include linux-firmware (nor the NPU driver binaries that it now contains).

That said, it's just a warning. If there is a preference to keep all warnings that were previously present, then we can keep this one.

@JohnAZoidberg: Let me know how you'd like this to be resolved!

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Mic92: Could you please approve this PR? I'm just proposing to cleanly revert an earlier contribution of mine (because it is no longer necessary). Being out-of-sync with upstream has some obvious security implications...

@Mic92 Mic92 enabled auto-merge October 30, 2025 11:30
@Mic92 Mic92 added this pull request to the merge queue Oct 30, 2025
Merged via the queue into NixOS:master with commit e07b161 Oct 30, 2025
2 checks passed
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