From c66094a3108b897a04a1bb4ee22f9cf6dcaaa737 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 May 2009 18:36:32 +0000 Subject: [PATCH] * Filenames should generally be in lowercase. svn path=/nixos/branches/modular-nixos/; revision=15702 --- .../hardware/network/{Intel2200BG.nix => intel-2200bg.nix} | 0 .../hardware/network/{Intel3945ABG.nix => intel-3945abg.nix} | 5 +++-- .../hardware/network/{Intel4965AGN.nix => intel-4965agn.nix} | 0 .../hardware/network/{ZydasZD1211.nix => zydas-zd1211.nix} | 0 .../hardware/video/encoder/{Go7007.nix => wis-go7007.nix} | 0 5 files changed, 3 insertions(+), 2 deletions(-) rename modules/hardware/network/{Intel2200BG.nix => intel-2200bg.nix} (100%) rename modules/hardware/network/{Intel3945ABG.nix => intel-3945abg.nix} (76%) rename modules/hardware/network/{Intel4965AGN.nix => intel-4965agn.nix} (100%) rename modules/hardware/network/{ZydasZD1211.nix => zydas-zd1211.nix} (100%) rename modules/hardware/video/encoder/{Go7007.nix => wis-go7007.nix} (100%) diff --git a/modules/hardware/network/Intel2200BG.nix b/modules/hardware/network/intel-2200bg.nix similarity index 100% rename from modules/hardware/network/Intel2200BG.nix rename to modules/hardware/network/intel-2200bg.nix diff --git a/modules/hardware/network/Intel3945ABG.nix b/modules/hardware/network/intel-3945abg.nix similarity index 76% rename from modules/hardware/network/Intel3945ABG.nix rename to modules/hardware/network/intel-3945abg.nix index 5ba3a1c0263..3344704ba5a 100644 --- a/modules/hardware/network/Intel3945ABG.nix +++ b/modules/hardware/network/intel-3945abg.nix @@ -2,14 +2,15 @@ let inherit (config.boot) kernelPackages; - inherit (kernelPackages) kernel; in +# !!! make this optional + { boot = { extraModulePackages = pkgs.lib.optional - (!kernel.features ? iwlwifi) + (!kernelPackages.kernel.features ? iwlwifi) kernelPackages.iwlwifi; }; diff --git a/modules/hardware/network/Intel4965AGN.nix b/modules/hardware/network/intel-4965agn.nix similarity index 100% rename from modules/hardware/network/Intel4965AGN.nix rename to modules/hardware/network/intel-4965agn.nix diff --git a/modules/hardware/network/ZydasZD1211.nix b/modules/hardware/network/zydas-zd1211.nix similarity index 100% rename from modules/hardware/network/ZydasZD1211.nix rename to modules/hardware/network/zydas-zd1211.nix diff --git a/modules/hardware/video/encoder/Go7007.nix b/modules/hardware/video/encoder/wis-go7007.nix similarity index 100% rename from modules/hardware/video/encoder/Go7007.nix rename to modules/hardware/video/encoder/wis-go7007.nix