colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: uncurse arguments

Browse Source 
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.
This commit is contained in:
K900 2024-03-16 18:19:44 +03:00
parent 56db90d274
commit 424d609df4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -12,8 +12,10 @@
, rustc , rustc
, rustPlatform , rustPlatform
, rust-bindgen , rust-bindgen
, nixosTests
}:
, # The kernel source tarball. { # The kernel source tarball.
src src
, # The kernel version. , # The kernel version.
@ -66,7 +68,6 @@
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
, kernelArch ? stdenv.hostPlatform.linuxArch , kernelArch ? stdenv.hostPlatform.linuxArch
, kernelTests ? [] , kernelTests ? []
, nixosTests
, ... , ...
}@args: }@args:

3
pkgs/top-level/linux-kernels.nix
View File

@ -713,6 +713,5 @@ in {
''; '';
}; };
buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; buildLinux = callPackage ../os-specific/linux/kernel/generic.nix {};
} }