Author: shlevy
Date: Fri Mar 16 03:20:12 2012
New Revision: 33139
URL: https://nixos.org/websvn/nix/?rev=33139&sc=1

Log:
Allow multiple definitions of boot.loader.kernelFile as long as they are all 
the same

Modified:
   nixos/trunk/modules/system/activation/top-level.nix

Modified: nixos/trunk/modules/system/activation/top-level.nix
==============================================================================
--- nixos/trunk/modules/system/activation/top-level.nix Fri Mar 16 02:55:17 
2012        (r33138)
+++ nixos/trunk/modules/system/activation/top-level.nix Fri Mar 16 03:20:12 
2012        (r33139)
@@ -38,6 +38,9 @@
       description = ''
         Name of the kernel file to be passed to the bootloader.
       '';
+      merge = kernelFiles:
+        builtins.head (map (f: assert f == builtins.head kernelFiles; f)
+          kernelFiles);
     };
 
     system.copySystemConfiguration = pkgs.lib.mkOption {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to