framenix kernel: 6.8-rc2 -> 6.8-rc3

flake.lock

@@ -174,11 +174,11 @@
     },
     "logseq-fix-nixpkgs": {
       "locked": {
-        "lastModified": 1706807864,
-        "narHash": "sha256-Zxctw9B6bbrw5QR4vpF/bAn8SgreeVBrdibAYXn+HWk=",
+        "lastModified": 1707316439,
+        "narHash": "sha256-3dVL8Wk7ECMiQrHVO1ys7FawMLo7iyQJyKG+aie1eaE=",
         "owner": "schmittlauch",
         "repo": "nixpkgs",
-        "rev": "e6cd575ea5c2d1182485d57234b31856ffc6b7d2",
+        "rev": "6f1431c8e2dfdfdfe25837c2cc94857900153cab",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1706913249,
-        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
+        "lastModified": 1707092692,
+        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e92b6015881907e698782c77641aa49298330223",
+        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1706826059,
-        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
+        "lastModified": 1707238373,
+        "narHash": "sha256-WKxT0yLzWbFZwYi92lI0yWJpYtRaFSWHGX8QXzejapw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
+        "rev": "fb0c047e30b69696acc42e669d02452ca1b55755",
         "type": "github"
       },
       "original": {

hosts/framenix/default.nix

@@ -24,40 +24,18 @@ in
     argsOverride = rec {
       src = pkgs.fetchurl {
         url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-        hash = "sha256-LiNkYsgTJby9MctxxLWKUhsH1hNnGRJNDjyv+FwsXXU=";
+        hash = "sha256-9CfwhjawHkMjNYqqJAHq9dQnpeWm0qH/UOAnSu82mNQ=";
       };
-      version = "6.8-rc2";
-      modDirVersion = "6.8.0-rc2";
+      version = "6.8-rc3";
+      modDirVersion = "6.8.0-rc3";
     };
   });
   # revert some commits that introduced the clourful graphics artefacts flickering,
   # at least that's the current working hypothesis in https://gitlab.freedesktop.org/drm/amd/-/issues/3097
   boot.kernelPatches = [
-    {name = "revert 9ae587f850a6702428273fcf4a2a9b392349b2a3";
-     patch = (pkgs.fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=9ae587f850a6702428273fcf4a2a9b392349b2a3";
-        hash = "sha256-5Uu8zxRSQuqE8oymjwPMt/ylsItpkQVDhbrOSMj8g3I=";
-        revert = true;
-    });}
-    {name = "revert 2eb412aa25ed2bf59f5ad5f7a09787d182d67934";
-     patch = (pkgs.fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=2eb412aa25ed2bf59f5ad5f7a09787d182d67934";
-        hash = "sha256-VtsH6bmwaLxPZ+uXvVE6qVWD2/aIKf9GLuMTNKq6d8M=";
-        revert = true;
-    });}
-    {name = "revert 0a1844bf0b532d84324453374ad6845f64066c28";
-     patch = (pkgs.fetchpatch {
-        url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=0a1844bf0b532d84324453374ad6845f64066c28";
-        hash = "sha256-Zd2pcYiOmuuzcc7THNtJW/YTjPyzO7HmQYKJNzy9YPw=";
-        revert = true;
-      });
-     # alternatively, 8569c3154538 can be reverted as well
-     extraStructuredConfig = with lib.kernel; {
-       DRM_I915 = no;
-       DRM_I915_GVT = lib.mkForce unset;
-       DRM_I915_GVT_KVMGT = lib.mkForce unset;
-     };
-     }
+    {name = "patch attempt from https://gitlab.freedesktop.org/drm/amd/-/issues/3097#note_2271482";
+     patch = ./0001-drm-buddy-Improve-alloc_range-error-handling-routine.patch;
+    }
     ];
 
   # temporary workaround for white flickering graphics artefacts