about summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2019-03-24 22:04:15 +0900
committerMatthieu Coudron <mattator@gmail.com>2019-08-10 02:27:52 +0900
commit2da1ad60a8ccc2946cfb6f547453ce2387a06bae (patch)
treee8fee5e24b167dc029f56d990a12d1b1b2315502 /nixos/modules/system
parent63fa75e34c12a296f2468e533407bca7c726b034 (diff)
downloadnixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar.gz
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar.bz2
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar.lz
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar.xz
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.tar.zst
nixlib-2da1ad60a8ccc2946cfb6f547453ce2387a06bae.zip
boot.kernelPackages: check for conflicts
It's currently possible to set conflicting `boot.kernelPackages` several times
which can prove confusing.
This is an attempt to warn for this.
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/kernel.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ee43fe100238..baa8c602a99e 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -36,6 +36,7 @@ in
 
     boot.kernelPackages = mkOption {
       default = pkgs.linuxPackages;
+      type = types.unspecified // { merge = mergeEqualOption; };
       apply = kernelPackages: kernelPackages.extend (self: super: {
         kernel = super.kernel.override {
           inherit randstructSeed;