Author: eelco Date: Sat Dec 18 17:56:04 2010 New Revision: 25192 URL: https://svn.nixos.org/websvn/nix/?rev=25192&sc=1
Log: * Fix the broken installer (http://hydra.nixos.org/build/811980). The hardware scan was generating a hardware.nix containing "pkgs.linuxPackages" without having "pkgs" in scope. Also, it shouldn't define boot.kernelPackages. Modified: nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl Modified: nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl ============================================================================== --- nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl Sat Dec 18 17:42:55 2010 (r25191) +++ nixos/trunk/modules/installer/tools/nixos-hardware-scan.pl Sat Dec 18 17:56:04 2010 (r25192) @@ -103,7 +103,7 @@ $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" || $device eq "0x4357") ) { - push @modulePackages, "kernelPackages.broadcom_sta"; + push @modulePackages, "config.boot.kernelPackages.broadcom_sta"; push @kernelModules, "wl"; } @@ -242,7 +242,7 @@ print <<EOF ; # This is a generated file. Do not modify! # Make changes to /etc/nixos/configuration.nix instead. -{modulesPath, ...}: +{ config, pkgs, modulesPath, ... }: { require = [ @@ -250,12 +250,9 @@ "\${modulesPath}/installer/scan/not-detected.nix" ]; - boot = rec { - initrd.kernelModules = [ $initrdKernelModules ]; - kernelModules = [ $kernelModules ]; - kernelPackages = pkgs.linuxPackages; - extraModulePackages = [ $modulePackages ]; - }; + boot.initrd.kernelModules = [ $initrdKernelModules ]; + boot.kernelModules = [ $kernelModules ]; + boot.extraModulePackages = [ $modulePackages ]; nix.maxJobs = $cpus; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
