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

NixOS · Jan 20, 2025 · e4d3693 · e4d3693
1 parent d7356a7
commit e4d3693
Showing 1 changed file with 5 additions and 18 deletions.
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix
@@ -61,24 +61,11 @@ stdenv.mkDerivation {
   inherit (kernel) version src;
 
   patches =
-    lib.optionals (lib.versionAtLeast kernel.version "5.10") [
-      # 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=";
-      })
-    ];
+    lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")
+      [
+        # fix wrong path to dmesg
+        ./fix-dmesg-path.diff
+      ];
 
   postPatch =
     ''