[Nix-dev] Re: [Nix-commits] SVN commit: nix - 13470 - raskin - nixos/trunk/system

[Ludovic Courtès]

Hello,

Michael Raskin <7c6f434c at mail.ru> writes:

> Author: raskin
> Date: 2008-11-27 20:35:26 +0000 (Thu, 27 Nov 2008)
> New Revision: 13470
>
> You can view the changes in this commit at:
>    https://svn.nixos.org/viewvc/nix?rev=13470&view=rev
>
> Modified:
>    nixos/trunk/system/system.nix
>
> Log:
> Fixing build for new kernels when Intel WiFi firmware is used
>
> Changes:
>
> Modified: nixos/trunk/system/system.nix
> ===================================================================
> --- nixos/trunk/system/system.nix	2008-11-27 20:33:17 UTC (rev 13469)
> +++ nixos/trunk/system/system.nix	2008-11-27 20:35:26 UTC (rev 13470)
> @@ -43,7 +43,8 @@
>    # directory.
>    modulesTree = pkgs.aggregateModules (
>      [kernel]
> -    ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi
> +    # Merged into mainline kernel
> +    # ++ pkgs.lib.optional ((config.networking.enableIntel3945ABGFirmware || config.networking.enableIntel4965AGNFirmware) && !kernel.features ? iwlwifi) kernelPackages.iwlwifi

Can you clarify why you commented out this line?  I tested it with Linux
2.6.27.4 and it works fine.  Without that, the kernel just doesn't find
any version 2 firmware.

Thanks,
Ludo'.