[Nix-dev] Re: [Nix-commits] SVN commit: nix - 13770 - eelco - nixos/trunk/upstart-jobs

Nicolas Pierron nicolas.b.pierron at gmail.com
Thu Jan 15 13:58:09 CET 2009


Hi,

On Thu, Jan 15, 2009 at 11:35, Eelco Dolstra <e.dolstra at tudelft.nl> wrote:
> Log:
> * The Linux kernel >= 2.6.27 provides firmware, so add it to the
>  firmware search path.

So we have to create a system/kernel.nix, ...

> Modified: nixos/trunk/upstart-jobs/default.nix
> ===================================================================
> --- nixos/trunk/upstart-jobs/default.nix        2009-01-14 18:58:44 UTC (rev 13769)
> +++ nixos/trunk/upstart-jobs/default.nix        2009-01-15 10:35:00 UTC (rev 13770)
> @@ -97,7 +97,8 @@
>         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode
>         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
>         ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
> -        ++ config.services.udev.addFirmware;
> +        ++ config.services.udev.addFirmware
> +        ++ ["${kernelPackages.kernel}/lib/firmware"];
>       extraUdevPkgs =
>            pkgs.lib.optional config.services.hal.enable pkgs.hal
>         ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007

... which binds services.udev.addFirmware almost as does
upstrat-jobs/pcmcia.nix and which is included as a default option of
NixOS.

PS: Please do not extend these lists because each element has a
different context and this add more complexity for reading the
reviewing code.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron
- If you are doing something twice then you should try to do it once.



More information about the nix-dev mailing list