From d19f6eaf6f463c1c425d7bf6e1cca1b687053126 Mon Sep 17 00:00:00 2001 From: eljamm Date: Fri, 25 Apr 2025 19:29:01 +0200 Subject: [PATCH 1/3] linux: add extraPassthru Currently, kernel update scripts can't be triggered, given that `passthru` doesn't propagate to the [final passthru](https://github.com/NixOS/nixpkgs/blob/59138c7667b7970d205d6a05a8bfa2d78caa3643/pkgs/os-specific/linux/kernel/generic.nix#L300). This change introduces `extraPassthru` for properly propagating it. --- pkgs/os-specific/linux/kernel/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 6c8ae502731e..f8ad1f892962 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -69,6 +69,7 @@ let "pc" ], extraMeta ? { }, + extraPassthru ? { }, isZen ? false, isLibre ? false, @@ -299,6 +300,7 @@ let passthru = previousAttrs.passthru or { } + // extraPassthru // basicArgs // { features = kernelFeatures; From d0851295e9405abd1e25c48d348df1abb2ee4946 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 31 May 2025 06:20:03 +0200 Subject: [PATCH 2/3] linux_zen: use extraPassthru.updateScript --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 79d056d2cf91..300b77082ef2 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -145,7 +145,7 @@ let UCLAMP_TASK_GROUP = mkKernelOverride (option no); }; - passthru.updateScript = [ + extraPassthru.updateScript = [ ./update-zen.py (if isLqx then "lqx" else "zen") ]; From a6a450c101dc3597403934aead32194d9cd722e6 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 31 May 2025 06:20:39 +0200 Subject: [PATCH 3/3] linux-libre: use extraPassthru.updateScript --- pkgs/os-specific/linux/kernel/linux-libre.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index baec656fcae8..7f9a48adb1b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -43,7 +43,7 @@ linux.override { ''; }; - passthru.updateScript = ./update-libre.sh; + extraPassthru.updateScript = ./update-libre.sh; maintainers = with lib.maintainers; [ qyliss ]; };