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

Remove extra arguments comming from config.*.

Browse Source 
svn path=/nixos/branches/fix-style/; revision=13381
This commit is contained in:
Nicolas Pierron 2008-11-23 01:29:20 +00:00
parent 3b2016569a
commit 205a7431ac
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boot/boot-stage-1.nix
View File

@ -4,7 +4,12 @@
# calls the init in the root file system to start the second boot # calls the init in the root file system to start the second boot
# stage. # stage.
{ pkgs, config, kernelPackages, modulesTree }: {pkgs, config}:
let
kernelPackages = config.boot.kernelPackages;
modulesTree = config.system.modulesTree;
in
rec { rec {

6
etc/default.nix
View File

@ -1,8 +1,12 @@
{ config, pkgs, systemPath, wrapperDir { config, pkgs, systemPath, wrapperDir
, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath , defaultShell
}: }:
let let
extraEtc = config.environment.etc;
nixEnvVars = config.nix.envVars;
modulesTree = config.system.modulesTree;
nssModulesPath = config.system.nssModules.path;
optional = pkgs.lib.optional; optional = pkgs.lib.optional;

4
installer/default.nix
View File

@ -1,7 +1,9 @@
{pkgs, config, nix}: {pkgs, config}:
let let
nix = config.environment.nix;
makeProg = args: pkgs.substituteAll (args // { makeProg = args: pkgs.substituteAll (args // {
dir = "bin"; dir = "bin";
isExecutable = true; isExecutable = true;

7
system/system.nix
View File

@ -41,7 +41,7 @@ rec {
# The initial ramdisk. # The initial ramdisk.
initialRamdiskStuff = import ../boot/boot-stage-1.nix { initialRamdiskStuff = import ../boot/boot-stage-1.nix {
inherit pkgs config kernelPackages modulesTree; inherit pkgs config;
}; };
initialRamdisk = initialRamdiskStuff.initialRamdisk; initialRamdisk = initialRamdiskStuff.initialRamdisk;
@ -49,7 +49,7 @@ rec {
# NixOS installation/updating tools. # NixOS installation/updating tools.
nixosTools = import ../installer { nixosTools = import ../installer {
inherit pkgs config nix; inherit pkgs config;
}; };
@ -70,8 +70,7 @@ rec {
# The static parts of /etc. # The static parts of /etc.
etc = import ../etc/default.nix { etc = import ../etc/default.nix {
inherit config pkgs systemPath wrapperDir inherit config pkgs systemPath wrapperDir
defaultShell nixEnvVars modulesTree nssModulesPath; defaultShell;
extraEtc = config.environment.etc;
}; };