diff --git a/packages/linux-tkg/default.nix b/packages/linux-tkg/default.nix index 374b677..f3c04ea 100644 --- a/packages/linux-tkg/default.nix +++ b/packages/linux-tkg/default.nix @@ -42,8 +42,6 @@ , ... } @ args: let - tkg = "2da317c20ed6f70085b195639b9aad2cacf31ab5"; - sources = import ./sources.nix { inherit fetchFromGitHub lib version; }; boolToKernel = bool: with lib.kernel; if bool then yes else no; @@ -325,11 +323,6 @@ in buildLinux(args // rec { } // flattenedConfig // extraConfig); - kernelPatches = #args.kernelPatches - [{ - name = "patch-${version}"; - patch = sources.patchSrc; - }] - ++ tkgPatches; + kernelPatches = tkgPatches; src = sources.kernelSrc; } // (args.argsOverride or {})) diff --git a/packages/linux-tkg/sources.nix b/packages/linux-tkg/sources.nix index 1619844..8a30019 100644 --- a/packages/linux-tkg/sources.nix +++ b/packages/linux-tkg/sources.nix @@ -3,26 +3,23 @@ let vMap = { "5.4" = { version = "5.4.128"; - baseHash = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz"; - patchHash = "04ylr4f4amzviqljhc6i79dqhjmjx45shf0rply1v5zqlfndb459"; + hash = "1arrpskxkkl6vb06d4y4xvfy1355mjk5ac5sp66657kbh6xswm1v"; }; "5.10" = { version = "5.10.46"; - baseHash = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw"; - patchHash = "0jl31aayxyns3pkvm9mycvwakg2i45win9nfbirhcz7z5gfsa7fg"; + hash = "058lvk0hc6qk3l485kda7cxkdrjk1kd0f75cp7pmnckbkjij54an"; }; "5.12" = { version = "5.12.13"; - baseHash = "0rn3z942vjc7bixjw066rm6kcr0x0wzgxqfq1f6xd113pzrgc3bx"; - patchHash = "17d38hns5qfbw1pajpa5y38v86r49nqnw7a3pwsay5fapj69z8w4"; + hash = "0mfjkncsa7vq13689dzzwms6wzsaj347qm1vf7k82nb3wp6myj5g"; }; }; tkg = fetchFromGitHub { owner = "Frogging-Family"; repo = "linux-tkg"; - rev = "2da317c20ed6f70085b195639b9aad2cacf31ab5"; - sha256 = "06a5fpafids8nc550pcsyvar2igphi6bpghqzl6cp48hg6p2g07w"; + rev = "c93cfdd20da1cf3b0860895c278b5a4676ccb057"; + sha256 = "0xpkdjq2ickhb8pqzqv5avjmrg3qyzryy8qv1wr9dxpkx197swdx"; }; ver = @@ -34,11 +31,7 @@ in rec { fullVersion = ver.version; kernelSrc = builtins.fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - sha256 = ver.baseHash; - }; - patchSrc = builtins.fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/patch-${fullVersion}.xz"; - sha256 = ver.patchHash; + url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${fullVersion}.tar.xz"; + sha256 = ver.hash; }; }