Unverified Commit 8704958a authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #175917 from cpcloud/linux_xanmod-5.15.43

parents fd50a393 58b3f669

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

+43 −37
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 


let

  stableVariant = {

    version = "5.15.40";

    version = "5.15.43";

    suffix = "xanmod1";

    hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ=";

    hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k=";

  };



  edgeVariant = {

    version = "5.17.8";

    version = "5.18.1";

    suffix = "xanmod1";

    hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs=";

    hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis=";

  };



  xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
@@ -24,7 +24,13 @@ let 
      inherit hash;

    };



    structuredExtraConfig = with lib.kernel; {

    structuredExtraConfig =

      with lib.kernel;

      with (lib.kernel.whenHelpers version);

      {

        # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master

        WERROR = no;



        # removed options

        CFS_BANDWIDTH = lib.mkForce (option no);

        RT_GROUP_SCHED = lib.mkForce (option no);
@@ -34,7 +40,7 @@ let 
        X86_AMD_PSTATE = yes;



        # Linux RNG framework

      LRNG = yes;

        LRNG = whenOlder "5.18" yes;



        # Paragon's NTFS3 driver

        NTFS3_FS = module;