nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge: linux: mark <6.12 with Rust as broken, assert on <6.7 with Rust (#346648)

Browse Source
This commit is contained in:
Maximilian Bosch 2024-10-12 17:04:58 +02:00 committed by GitHub
commit db56cecb0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -34,7 +34,11 @@ let
# Currently not enabling Rust by default, as upstream requires rustc 1.81 # Currently not enabling Rust by default, as upstream requires rustc 1.81
defaultRust = false; defaultRust = false;
withRust = (forceRust || defaultRust) && kernelSupportsRust; withRust =
assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) ''
Kernels below 6.7 (the kernel being built is ${version}) don't support Rust.
'';
(forceRust || defaultRust) && kernelSupportsRust;
options = { options = {

3
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -396,6 +396,9 @@ let
requiredSystemFeatures = [ "big-parallel" ]; requiredSystemFeatures = [ "big-parallel" ];
meta = { meta = {
# https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
broken = withRust && lib.versionOlder version "6.12";
description = description =
"The Linux kernel" + "The Linux kernel" +
(if kernelPatches == [] then "" else (if kernelPatches == [] then "" else