diff options
| author | K900 <me@0upti.me> | 2024-03-16 18:19:44 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-03-16 18:39:32 +0300 |
| commit | 424d609df48f52345869c66979a4791f3bc856b4 (patch) | |
| tree | d51760f82f5f7ec748076a02019c395a5b7f2588 | |
| parent | 56db90d274a9ca99c4bcf113e68bacbec0efeed0 (diff) | |
linux: uncurse arguments
Currently things like `buildLinux { inherit src version; }` fail because of
`callPackage` auto-inserting `kernelPatches`, which is both a `buildLinux`
argument and a `pkgs` toplevel attribute, with completely different semantics.
Avoid that entirely by splitting the call into two - one for arguments we want
from `callPackage`, and one for everything else.
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 14c863b459b1e..9c1f5a86f37e7 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -12,8 +12,10 @@ , rustc , rustPlatform , rust-bindgen +, nixosTests +}: -, # The kernel source tarball. +{ # The kernel source tarball. src , # The kernel version. @@ -66,7 +68,6 @@ , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch , kernelTests ? [] -, nixosTests , ... }@args: diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 1a040f052c71c..afcec5061a368 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -713,6 +713,5 @@ in { ''; }; - buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; - + buildLinux = callPackage ../os-specific/linux/kernel/generic.nix {}; } |