Skip to content

linux: add extra passthru #412568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thiagokokada merged 3 commits into from
Jun 15, 2025
Merged

linux: add extra passthru #412568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d19f6ea
linux: add extraPassthru
eljamm Apr 25, 2025
d085129
linux_zen: use extraPassthru.updateScript
eljamm May 31, 2025
a6a450c
linux-libre: use extraPassthru.updateScript
eljamm May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/kernel/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ let
"pc"
],
extraMeta ? { },
extraPassthru ? { },

isZen ? false,
isLibre ? false,
Expand Down Expand Up @@ -299,6 +300,7 @@ let

passthru =
previousAttrs.passthru or { }
// extraPassthru
// basicArgs
Copy link
Contributor

@thiagokokada thiagokokada Jun 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR but kind strange that we are merging basicArgs to passthru.

Copy link
Contributor

@thiagokokada thiagokokada Jun 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example:

nix-repl> legacyPackages.x86_64-linux.linuxPackages_zen.kernel.passthru
{
  baseVersion = "6.14.7";
  commonMakeFlags = [ ... ];
  commonStructuredConfig = { ... };
  config = { ... };
  configEnv = «derivation /nix/store/ncilq58kr4pl2r10pqgnwnm0sgbwkggm-linux-zen-6.14.7.drv»;
  configfile = «derivation /nix/store/c1nfai5wq9x84wljlisqb2pri1r615s3-linux-config-6.14.7.drv»;
  extraMakeFlags = [ ... ];
  features = { ... };
  isHardened = false;
  isLibre = false;
  isXen = true;
  isZen = true;
  kernelAtLeast = «lambda versionAtLeast @ /nix/store/8ky1s7q96lz5n6gpyb6gdsiqhxin6dfr-source/lib/strings.nix:1944:24»;
  kernelOlder = «lambda versionOlder @ /nix/store/8ky1s7q96lz5n6gpyb6gdsiqhxin6dfr-source/lib/strings.nix:1910:22»;
  kernelPatches = [ ... ];
  modDirVersion = "6.14.7-zen1";
  moduleBuildDependencies = [ ... ];
  pname = "linux-zen";
  src = «derivation /nix/store/2by3j92cr187df98ijql39jj813az299-source.drv»;
  stdenv = «derivation /nix/store/ljjhsmahjyc0l49q4v21mkzrhn2p24ra-stdenv-linux.drv»;
  structuredExtraConfig = { ... };
  tests = { ... };
  updateScript = [ ... ];
  version = "6.14.7";
  withRust = true;
}

I don't think things like src or stdenv is supposed to be in passthru.

Copy link
Contributor Author

@eljamm eljamm Jun 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is why it was added: 6318529. Don't know if it's still relevant or not for our current infra.

// {
features = kernelFeatures;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/linux-libre.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ linux.override {
'';
};

passthru.updateScript = ./update-libre.sh;
extraPassthru.updateScript = ./update-libre.sh;

maintainers = with lib.maintainers; [ qyliss ];
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/zen-kernels.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ let
UCLAMP_TASK_GROUP = mkKernelOverride (option no);
};

passthru.updateScript = [
extraPassthru.updateScript = [
./update-zen.py
(if isLqx then "lqx" else "zen")
];
Expand Down