Commit e4d3693c authored by K900's avatar K900
Browse files

perf: don't apply dmesg patch on 6.13, remove 6.10 patches

parent d7356a72

pkgs/os-specific/linux/kernel/perf/default.nix

+5 −18
Original line number Diff line number Diff line
@@ -61,23 +61,10 @@ stdenv.mkDerivation { 
  inherit (kernel) version src;



  patches =

    lib.optionals (lib.versionAtLeast kernel.version "5.10") [

    lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")

      [

        # fix wrong path to dmesg

        ./fix-dmesg-path.diff

    ]

    ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [

      (fetchpatch {

        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";

        hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";

      })

      (fetchpatch {

        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee";

        hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo=";

      })

      (fetchpatch {

        url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd";

        hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI=";

      })

      ];



  postPatch =