Unverified Commit db56cecb authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

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

parents f53bdd90 19b96763

pkgs/os-specific/linux/kernel/common-config.nix

+5 −1
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ let 


  # Currently not enabling Rust by default, as upstream requires rustc 1.81

  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 = {

pkgs/os-specific/linux/kernel/manual-config.nix

+3 −0
Original line number Diff line number Diff line
@@ -396,6 +396,9 @@ let 
      requiredSystemFeatures = [ "big-parallel" ];



      meta = {

        # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381

        broken = withRust && lib.versionOlder version "6.12";



        description =

          "The Linux kernel" +

          (if kernelPatches == [] then "" else