Skip to content
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

linux/kernel/generic.nix: assert if constraints would be ignored #230036

Closed
wants to merge 1 commit into from
Closed

linux/kernel/generic.nix: assert if constraints would be ignored #230036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion pkgs/os-specific/linux/kernel/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@

assert stdenv.isLinux;

assert args?extraStructuredConfig ->
throw "you passed extraStructuredConfig (nixos name) instead of structuredExtraConfig (nixpkgs name)";

let
# Dirty hack to make sure that `version` & `src` have
# `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position
Expand Down Expand Up @@ -105,7 +108,10 @@ let
+ stdenv.hostPlatform.linux-kernel.extraConfig or "";

structuredConfigFromPatches =
map ({extraStructuredConfig ? {}, ...}: {settings=extraStructuredConfig;}) kernelPatches;
map ({extraStructuredConfig ? {}, ...}@args:
assert args?structuredExtraConfig ->
throw "you passed structuredExtraConfig (nixpkgs name) instead of extraStructuredConfig (nixos name)";
{settings=extraStructuredConfig;}) kernelPatches;

# appends kernel patches extraConfig
kernelConfigFun = baseConfigStr:
Expand Down