From 50b8fd1ff95f6011c981546b07999ef52335869b Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 20 Dec 2025 00:33:06 +0000 Subject: [PATCH] jool: Unbreak with linux kernel >= 6.18 Courtesy: https://gitlab.alpinelinux.org/alpine/aports/-/commit/039d64c4c48ab3533c46e012a7e218ce40a5aa9d --- pkgs/os-specific/linux/jool/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 0af71b24ac95..b9694444867a 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, kernel, kernelModuleMakeFlags, nixosTests, @@ -16,6 +17,13 @@ stdenv.mkDerivation { src = sourceAttrs.src; + patches = lib.optionals (lib.versionAtLeast kernel.version "6.18.0") [ + (fetchpatch { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/3.23-stable/community/jool-modules-lts/kernel-6.18.patch"; + hash = "sha256-EtV95YaOzPU3e/8NQvUtAH/RWiV16djeKrnvSgYybCQ="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ];