From 598b7e824130dbf289e9d9d4b16e39fbfd9d4977 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Fri, 12 Nov 2021 21:54:23 +0700 Subject: [PATCH] kernel: bump to 5.15.2 also moved linux-tkg to flake inputs --- flake.lock | 17 +++++++++++++++++ flake.nix | 15 ++++++++------- packages/linux-lava/default.nix | 4 ++-- packages/linux-lava/sources.nix | 30 +++++++++++------------------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 6cf586b..77d6c33 100644 --- a/flake.lock +++ b/flake.lock @@ -213,6 +213,22 @@ "type": "github" } }, + "linux-tkg": { + "flake": false, + "locked": { + "lastModified": 1636723194, + "narHash": "sha256-zsnD3NnWAEPa4ibYE22bHBvrY3JhD3lO/gkKseYT2E0=", + "owner": "Frogging-Family", + "repo": "linux-tkg", + "rev": "ba636511f4862466b11ea69264cab70b7ccb3459", + "type": "github" + }, + "original": { + "owner": "Frogging-Family", + "repo": "linux-tkg", + "type": "github" + } + }, "neovim-flake": { "inputs": { "flake-utils": "flake-utils", @@ -472,6 +488,7 @@ "fast-syntax-highlighting": "fast-syntax-highlighting", "fix-user-popouts": "fix-user-popouts", "home-manager": "home-manager", + "linux-tkg": "linux-tkg", "neovim-nightly": "neovim-nightly", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix index e9a9a9d..269bfa9 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ # overlays discord-tokyonight = { url = "github:DanisDGK/zelk-customizations"; flake = false; }; discover = { url = "github:trigg/Discover"; flake = false; }; + linux-tkg = { url = "github:Frogging-Family/linux-tkg"; flake = false; }; packwiz = { url = "github:comp500/packwiz"; flake = false; }; spotify-adblock = { url = "github:abba23/spotify-adblock"; flake = false; }; tree-sitter-glimmer = { url = "github:alexlafroscia/tree-sitter-glimmer"; flake = false; }; @@ -77,13 +78,13 @@ let callPackage = pkgs.callPackage; in { - discord-tokyonight = callPackage ./packages/discord-tokyonight {}; - discover-overlay = callPackage ./packages/discover {}; - linux-lava = callPackage ./packages/linux-lava {}; - packwiz = callPackage ./packages/packwiz {}; - spotify-adblock = callPackage ./packages/spotify-adblock {}; - tree-sitter-glimmer = callPackage ./packages/tree-sitter-glimmer {}; - tree-sitter-jsonc = callPackage ./packages/tree-sitter-jsonc {}; + discord-tokyonight = callPackage ./packages/discord-tokyonight { inherit inputs; }; + discover-overlay = callPackage ./packages/discover { inherit inputs; }; + linux-lava = callPackage ./packages/linux-lava { inherit inputs; }; + packwiz = callPackage ./packages/packwiz { inherit inputs; }; + spotify-adblock = callPackage ./packages/spotify-adblock { inherit inputs; }; + tree-sitter-glimmer = callPackage ./packages/tree-sitter-glimmer { inherit inputs; }; + tree-sitter-jsonc = callPackage ./packages/tree-sitter-jsonc { inherit inputs; }; wine-osu = callPackage ./packages/wine-osu { inherit getPaths; }; }; diff --git a/packages/linux-lava/default.nix b/packages/linux-lava/default.nix index 25ce4b0..e8e0f40 100644 --- a/packages/linux-lava/default.nix +++ b/packages/linux-lava/default.nix @@ -1,12 +1,13 @@ { buildLinux , callPackage +, inputs , kernelPatches , lib , ... } @ args: let - sources = callPackage ./sources.nix {}; + sources = callPackage ./sources.nix { inherit inputs; }; in buildLinux (args // { inherit (sources) src kernelPatches; version = "${sources.version}-tkg-Lava"; @@ -17,7 +18,6 @@ in buildLinux (args // { structuredExtraConfig = with lib.kernel; builtins.mapAttrs (_: value: lib.mkForce value) { LOCALVERSION = freeform "-tkg-Lava"; ZENIFY = yes; - FUTEX2 = yes; MHASWELL = yes; WINESYNC = module; diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index d4bc5cf..7856b2e 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,12 +1,10 @@ -{ fetchFromGitHub, lib }: +{ fetchFromGitHub, inputs, lib }: let - version = "5.14.14"; - kernelHash = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; - kernelPatchHash = "1lsjswbfn67ndcy2l1prrmn7cbabvhd8mhhg0v36x1pvml86q3wq"; - tkgRev = "f2fa2f00ef379d4bb8f794a58d1dc5a48966c74c"; - tkgHash = "1ycxip1hlshcl9nxb8si4ckl8q7w62nyndwcj8iqmxbwnsx1kvkd"; - caculeRev = "d03c1167152d4af037fc008bc9fa651b900d75d5"; - caculeHash = "0xcfamxs4znmq3wfracr5jf59dlpig0b5s0aabi9zqzb61ds7i5z"; + version = "5.15.2"; + kernelHash = "1s0yk78kilcr3vd14k67cmllnrx0x0i00jdkl5kkn3lij5lwzcjp"; + kernelPatchHash = "0d6x90dcq9sdpw4za62bsd3yijy2s6y0v5vr36hcvqwv661ab822"; + caculeRev = "2ac16b14bc0281c3b6c14828688981633b82ffd8"; + caculeHash = "0li0zaizxvpigngv1954hkw8dirwyvqy93gb3af33cm47ir9049p"; tkgPatches = [ "0001-mm-Support-soft-dirty-flag-reset-for-VA-range" @@ -15,8 +13,8 @@ let #"0003-cacule-${mm}" "0003-glitched-base" "0003-glitched-cfs" - "0007-v${mm}-fsync" - "0007-v${mm}-futex2_interface" + "0007-v${mm}-futex_waitv" + "0007-v${mm}-fsync1_via_futex_waitv" "0007-v${mm}-winesync" "0012-misc-additions" ]; @@ -26,12 +24,6 @@ let name = "patch-${path}"; patch = path; }; - tkgSrc = fetchFromGitHub { - owner = "Frogging-Family"; - repo = "linux-tkg"; - rev = tkgRev; - sha256 = tkgHash; - }; kernelPatchSrc = { name = "patch"; patch = builtins.fetchurl { @@ -42,8 +34,8 @@ let caculeSrc = { name = "cacule"; patch = builtins.fetchurl { - url = "https://raw.githubusercontent.com/hamadmarri/cacule-cpu-scheduler/${caculeRev}/patches/CacULE/v${mm}/cacule-${mm}.patch"; - sha256 = caculeHash; + url = "https://raw.githubusercontent.com/CachyOS/cacule-cpu-scheduler/${caculeRev}/patches/CacULE/v${mm}/cacule-${mm}-full.patch"; + sha256 = caculeHash; }; }; @@ -63,6 +55,6 @@ in { ] ++ builtins.map (name: { inherit name; - patch = "${tkgSrc}/linux-tkg-patches/${mm}/${name}.patch"; + patch = "${inputs.linux-tkg}/linux-tkg-patches/${mm}/${name}.patch"; }) tkgPatches; }