public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed instantiation errors after kernel changes...

Browse Source 
svn path=/nixos/trunk/; revision=11886
This commit is contained in:
Michael Raskin 2008-05-23 06:40:16 +00:00
parent ecef3b1f61
commit da13d7ed13
7 changed files with 16 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configuration/closed-install.nix
View File

@ -25,11 +25,6 @@ in
addIP = "10.0.253.251";
netmask = "255.255.0.0";
kernel = pkgs: (
pkgs.aggregateModules
[pkgs.kernel]
);
packages = pkgs : [
pkgs.patch
pkgs.irssi

25
configuration/live-dvd-X-medium.nix
View File

@ -19,21 +19,8 @@ let
tty = "9";
};
theKernel = pkgs: let baseKernel=pkgs.kernel;
in (pkgs.aggregateModules
[
baseKernel
(pkgs.kqemuFunCurrent baseKernel)
(pkgs.atherosFun {
kernel = baseKernel;
version = "r2756";
pci001c_rev01 = true;
} null)
]);
in
(isoFun {
(isoFun (rec {
inherit platform;
lib = (import ../pkgs/lib);
@ -48,12 +35,7 @@ in
includeBuildDeps = true;
addUsers = ["nixos" "livecd" "livedvd"
"user" "guest" "nix"];
kernel = pkgs: (
pkgs.aggregateModules
[pkgs.kernel]
);
extraInitrdKernelModules =
import ./moduleList.nix;
@ -120,7 +102,6 @@ in
pkgs.wirelesstools
pkgs.usbutils
pkgs.dmidecode
(theKernel pkgs)
pkgs.sshfsFuse
pkgs.ratpoison
pkgs.xorg.twm
@ -229,4 +210,4 @@ in
});
}
];
}).rescueCD
})).rescueCD

18
configuration/live-dvd-X-no-soft.nix
View File

@ -19,19 +19,6 @@ let
tty = "9";
};
theKernel = pkgs: let baseKernel=pkgs.kernel;
in (pkgs.aggregateModules
[
baseKernel
(pkgs.kqemuFunCurrent baseKernel)
(pkgs.atherosFun {
kernel = baseKernel;
version = "r2756";
pci001c_rev01 = true;
} null)
]);
in
(isoFun {
inherit platform;
@ -49,10 +36,7 @@ in
addUsers = ["nixos" "livecd" "livedvd"
"user" "guest" "nix"];
kernel = pkgs: (
pkgs.aggregateModules
[pkgs.kernel]
);
extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
extraInitrdKernelModules =
import ./moduleList.nix;

19
configuration/live-dvd-X.nix
View File

@ -19,19 +19,6 @@ let
tty = "9";
};
theKernel = pkgs: let baseKernel=pkgs.kernel;
in (pkgs.aggregateModules
[
baseKernel
(pkgs.kqemuFunCurrent baseKernel)
(pkgs.atherosFun {
kernel = baseKernel;
version = "r2756";
pci001c_rev01 = true;
} null)
]);
in
(isoFun {
inherit platform;
@ -49,10 +36,7 @@ in
addUsers = ["nixos" "livecd" "livedvd"
"user" "guest" "nix"];
kernel = pkgs: (
pkgs.aggregateModules
[pkgs.kernel]
);
extraModulePackages = pkgs: [pkgs.kernelPackages.kqemu];
extraInitrdKernelModules =
import ./moduleList.nix;
@ -128,7 +112,6 @@ in
pkgs.sdparm
pkgs.hdparm
pkgs.hddtemp
(theKernel pkgs)
pkgs.sshfsFuse
pkgs.ratpoison
pkgs.xorg.twm

5
configuration/live-dvd.nix
View File

@ -16,11 +16,6 @@ in
includeStdenv = true;
includeBuildDeps = true;
kernel = pkgs: (
pkgs.aggregateModules
[pkgs.kernel]
);
packages = pkgs : [
pkgs.irssi
pkgs.elinks

11
configuration/rescue-cd-configurable.nix
View File

@ -12,7 +12,8 @@
,includeMemtest ? true
,includeStdenv ? true
,includeBuildDeps ? false
,kernel ? (pkgs : pkgs.kernel)
,kernelPackages ? (pkgs : pkgs.kernelPackages)
,extraModulePackages ? (pkgs : [])
,addUsers ? []
,extraInitrdKernelModules ? []
,bootKernelModules ? []
@ -127,16 +128,16 @@ rec {
extraTTYs = []
++ (lib.optional manualEnabled 7)
++ (lib.optional rogueEnabled 8);
inherit kernel;
inherit kernelPackages;
initrd = {
extraKernelModules = extraInitrdKernelModules
++ (if aufs then ["aufs"] else [])
;
};
kernelModules = bootKernelModules;
extraModulePackages = []
++(if aufs then [pkgs.aufs] else [])
;
extraModulePackages = pkgs: ((extraModulePackages pkgs)
++(if aufs then [(kernelPackages pkgs).aufs] else [])
);
};
services = {

9
upstart-jobs/xserver.nix
View File

@ -36,7 +36,7 @@ let
modules =
optional (videoDriver == "nvidia") pkgs.nvidiaDrivers #make sure it first loads the nvidia libs
optional (videoDriver == "nvidia") nvidiaDrivers #make sure it first loads the nvidia libs
++ [
xorg.xorgserver
xorg.xf86inputkeyboard
@ -313,6 +313,7 @@ let
};
in if cfg.slim.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
nvidiaDrivers = (config.boot.kernelPackages pkgs).nvidiaDrivers;
in
@ -351,7 +352,7 @@ rec {
xorg.xset # used by startkde, non-essential
]
++ optional (videoDriver == "nvidia") [
pkgs.nvidiaDrivers
nvidiaDrivers
];
@ -375,7 +376,7 @@ rec {
rm -f /var/run/opengl-driver
${if videoDriver == "nvidia"
then ''
ln -sf ${pkgs.nvidiaDrivers} /var/run/opengl-driver
ln -sf ${nvidiaDrivers} /var/run/opengl-driver
''
else if cfg.driSupport
then "ln -sf ${pkgs.mesa} /var/run/opengl-driver"
@ -392,7 +393,7 @@ rec {
env XKB_BINDIR=${xorg.xkbcomp}/bin # Needed for the Xkb extension.
${if videoDriver == "nvidia"
then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${pkgs.nvidiaDrivers}/lib"
then "env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:${nvidiaDrivers}/lib"
else ""
}