cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

packages/linux-lava: bump to 6.1.1 and remove atomic pageflip patch

Browse source
This commit is contained in:
LavaDesu 2022-12-28 20:11:51 +07:00
parent ea20656dac
commit 88d2274808
Signed by: cilly
GPG key ID: 6500251E087653C9
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
packages/linux-lava/sources.nix
View file

@ -1,8 +1,8 @@
{ fetchFromGitHub, inputs, lib }: { fetchFromGitHub, inputs, lib }:
let let
version = "6.0.0"; version = "6.1.1";
kernelHash = "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w"; kernelHash = "1ssxn81jfl0jf9brczfrrwd1f1vmf594jvhrs7zgcc54a5qg389c";
#kernelPatchHash = "0y25zs7rlk9dz9ppyr76rv6id64j3f4hpby4wljmy7p9z9wba30s"; kernelPatchHash = "0qmmg4lmz8qhbdc2k6lhavbfak2r64jr8ac16wvnm1x72jwcsil9";
mm = lib.versions.majorMinor version; mm = lib.versions.majorMinor version;
tkgPatches = [ tkgPatches = [
@ -14,7 +14,6 @@ let
"0003-glitched-cfs-additions" "0003-glitched-cfs-additions"
"0007-v${mm}-fsync1_via_futex_waitv" "0007-v${mm}-fsync1_via_futex_waitv"
"0007-v${mm}-winesync" "0007-v${mm}-winesync"
"0010-lru_${mm}"
"0012-misc-additions" "0012-misc-additions"
]; ];
@ -22,19 +21,19 @@ let
name = "patch-${path}"; name = "patch-${path}";
patch = path; patch = path;
}; };
# kernelPatchSrc = { kernelPatchSrc = {
# name = "patch"; name = "patch";
# patch = builtins.fetchurl { patch = builtins.fetchurl {
# url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz"; url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${version}.xz";
# sha256 = kernelPatchHash; sha256 = kernelPatchHash;
# }; };
# }; };
borePatch = { borePatch = {
name = "bore-patch"; name = "bore-patch";
patch = builtins.fetchurl { patch = builtins.fetchurl {
url = "https://raw.githubusercontent.com/CachyOS/kernel-patches/faaa50992e7ddea9191eb51920ffbf41226c9741/${mm}/sched/0001-bore.patch"; url = "https://raw.githubusercontent.com/CachyOS/kernel-patches/78e1cd84c173959e87cca10f648fbcfbb37fbad2/${mm}/sched/0001-bore.patch";
sha256 = "1a3vypmrlr20fdvzshgqad3c64bh5hd4295p42j0260dz7vzbf7v"; sha256 = "10dfd15zhvkvlk29zqlmgxm99y3lbkjlilvrbrdl8rjcybs4gbws";
}; };
}; };
in { in {
@ -50,11 +49,11 @@ in {
}; };
kernelPatches = [ kernelPatches = [
#kernelPatchSrc kernelPatchSrc
borePatch borePatch
(patch ./si-manual-clocking.patch) (patch ./si-manual-clocking.patch)
(patch ./atomic-async-page-flips.patch) #(patch ./atomic-async-page-flips.patch)
(patch ./winesync-hotfix.patch) #(patch ./winesync-hotfix.patch)
] ]
++ builtins.map (name: { ++ builtins.map (name: {
inherit name; inherit name;