123 lines
3.7 KiB
Diff
123 lines
3.7 KiB
Diff
|
diff --git a/flake.lock b/flake.lock
|
||
|
|
index 4111c00..7e9d21d 100644
|
||
|
|
--- a/flake.lock
|
||
|
|
+++ b/flake.lock
|
||
|
|
@@ -510,11 +510,11 @@
|
||
|
|
},
|
||
|
|
"nixpkgs_2": {
|
||
|
|
"locked": {
|
||
|
|
- "lastModified": 1705133751,
|
||
|
|
- "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
|
||
|
|
+ "lastModified": 1702312524,
|
||
|
|
+ "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||
|
|
"owner": "NixOS",
|
||
|
|
"repo": "nixpkgs",
|
||
|
|
- "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
|
||
|
|
+ "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
||
|
|
"type": "github"
|
||
|
|
},
|
||
|
|
"original": {
|
||
|
|
diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix
|
||
|
|
index cef6ed7..9b0ba41 100644
|
||
|
|
--- a/packages/linux-lava/sources.nix
|
||
|
|
+++ b/packages/linux-lava/sources.nix
|
||
|
|
@@ -1,17 +1,19 @@
|
||
|
|
{ fetchFromGitHub, inputs, lib }:
|
||
|
|
let
|
||
|
|
- version = "6.7.0";
|
||
|
|
- kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg";
|
||
|
|
+ version = "6.6.7";
|
||
|
|
+ kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr";
|
||
|
|
kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj";
|
||
|
|
|
||
|
|
mm = lib.versions.majorMinor version;
|
||
|
|
tkgPatches = [
|
||
|
|
+ "0001-mm-Support-soft-dirty-flag-reset-for-VA-range"
|
||
|
|
"0002-clear-patches"
|
||
|
|
+ "0002-mm-Support-soft-dirty-flag-read-with-reset"
|
||
|
|
"0003-glitched-base"
|
||
|
|
"0003-glitched-eevdf-additions"
|
||
|
|
"0003-glitched-cfs"
|
||
|
|
"0007-v${mm}-fsync1_via_futex_waitv"
|
||
|
|
-# "0007-v${mm}-winesync" currently fails to patch
|
||
|
|
+ "0007-v${mm}-winesync"
|
||
|
|
"0012-misc-additions"
|
||
|
|
];
|
||
|
|
|
||
|
|
@@ -35,7 +37,7 @@ in {
|
||
|
|
};
|
||
|
|
|
||
|
|
kernelPatches = [
|
||
|
|
- #kernelPatchSrc
|
||
|
|
+ kernelPatchSrc
|
||
|
|
]
|
||
|
|
++ builtins.map (name: {
|
||
|
|
inherit name;
|
||
|
|
diff --git a/pathc.patch b/pathc.patch
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..7269733
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/pathc.patch
|
||
|
|
@@ -0,0 +1,36 @@
|
||
|
|
+diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix
|
||
|
|
+index 9b0ba41..cef6ed7 100644
|
||
|
|
+--- a/packages/linux-lava/sources.nix
|
||
|
|
++++ b/packages/linux-lava/sources.nix
|
||
|
|
+@@ -1,19 +1,17 @@
|
||
|
|
+ { fetchFromGitHub, inputs, lib }:
|
||
|
|
+ let
|
||
|
|
+- version = "6.6.7";
|
||
|
|
+- kernelHash = "1l2nisx9lf2vdgkq910n5ldbi8z25ky1zvl67zgwg2nxcdna09nr";
|
||
|
|
++ version = "6.7.0";
|
||
|
|
++ kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg";
|
||
|
|
+ kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj";
|
||
|
|
+
|
||
|
|
+ mm = lib.versions.majorMinor version;
|
||
|
|
+ tkgPatches = [
|
||
|
|
+- "0001-mm-Support-soft-dirty-flag-reset-for-VA-range"
|
||
|
|
+ "0002-clear-patches"
|
||
|
|
+- "0002-mm-Support-soft-dirty-flag-read-with-reset"
|
||
|
|
+ "0003-glitched-base"
|
||
|
|
+ "0003-glitched-eevdf-additions"
|
||
|
|
+ "0003-glitched-cfs"
|
||
|
|
+ "0007-v${mm}-fsync1_via_futex_waitv"
|
||
|
|
+- "0007-v${mm}-winesync"
|
||
|
|
++# "0007-v${mm}-winesync" currently fails to patch
|
||
|
|
+ "0012-misc-additions"
|
||
|
|
+ ];
|
||
|
|
+
|
||
|
|
+@@ -37,7 +35,7 @@ in {
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ kernelPatches = [
|
||
|
|
+- kernelPatchSrc
|
||
|
|
++ #kernelPatchSrc
|
||
|
|
+ ]
|
||
|
|
+ ++ builtins.map (name: {
|
||
|
|
+ inherit name;
|
||
|
|
diff --git a/pdathc.patch b/pdathc.patch
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..bcff374
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/pdathc.patch
|
||
|
|
@@ -0,0 +1,19 @@
|
||
|
|
+diff --git a/flake.lock b/flake.lock
|
||
|
|
+index 0338d1b..4111c00 100644
|
||
|
|
+--- a/flake.lock
|
||
|
|
++++ b/flake.lock
|
||
|
|
+@@ -510,11 +510,11 @@
|
||
|
|
+ },
|
||
|
|
+ "nixpkgs_2": {
|
||
|
|
+ "locked": {
|
||
|
|
+- "lastModified": 1702312524,
|
||
|
|
+- "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||
|
|
++ "lastModified": 1705133751,
|
||
|
|
++ "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=",
|
||
|
|
+ "owner": "NixOS",
|
||
|
|
+ "repo": "nixpkgs",
|
||
|
|
+- "rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
||
|
|
++ "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
|
||
|
|
+ "type": "github"
|
||
|
|
+ },
|
||
|
|
+ "original": {
|