alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Fix the broken installer (http://hydra.nixos.org/build/811980). The

Browse source 
hardware scan was generating a hardware.nix containing
  "pkgs.linuxPackages" without having "pkgs" in scope.  Also, it
  shouldn't define boot.kernelPackages.

svn path=/nixos/trunk/; revision=25192
This commit is contained in:
Eelco Dolstra 2010-12-18 17:56:04 +00:00
parent 3b28efd00d
commit ba459a0bf3
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/installer/tools/nixos-hardware-scan.pl
View file

@ -103,7 +103,7 @@ sub pciCheck {
$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 @@ my $attrs = multiLineList(" ", removeDups @attrs);
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 @@ print <<EOF ;
"\${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;