Skip to content

linux/generic.nix: Fix CONFIG_RUST#308763

Merged
alyssais merged 1 commit intoNixOS:masterfrom
hercules-ci:fix-kernel-config-rust
May 3, 2024
Merged

linux/generic.nix: Fix CONFIG_RUST#308763
alyssais merged 1 commit intoNixOS:masterfrom
hercules-ci:fix-kernel-config-rust

Conversation

@roberth
Copy link
Member

@roberth roberth commented May 3, 2024

I thought it was module based, but it wasn't.

Fixes #306790 (comment)

This has broken [...] Rust support

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

I thought it was module based, but it wasn't.

Fixes NixOS#306790 (comment)

> This has broken [...] Rust support
@alyssais
Copy link
Member

alyssais commented May 3, 2024

@ofborg test kernel-rust

@alyssais
Copy link
Member

alyssais commented May 3, 2024

Oh, I'm also wondering if we need to go back to optionalAttrs, since older kernels probably won't recognise CONFIG_RUST:

@ofborg build linux_5_10

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 3, 2024
@alyssais alyssais merged commit e768d95 into NixOS:master May 3, 2024
@roberth
Copy link
Member Author

roberth commented May 3, 2024

wondering if we need to go back to optionalAttrs, since older kernels probably won't recognise CONFIG_RUST

If someone needs an even older kernel, we could condition it on the kernel version, which I think is readily available at this point, unlike withRust, which evaluates the kernel patches.

-CONFIG_RUST = if withRust then "y" else "n";
+CONFIG_RUST = optionalAttrs (isNotAncient version) (if withRust then "y" else "n");

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants