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

* Remove "obsolete" notation.

Browse Source 
svn path=/nixos/trunk/; revision=12557
This commit is contained in:
Eelco Dolstra 2008-08-08 19:40:19 +00:00
parent a662f1c473
commit 1c2d81d93d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configuration/rescue-cd.nix
View File

@ -18,9 +18,9 @@ rec {
# The label used to identify the installation CD. # The label used to identify the installation CD.
rootLabel = "NIXOS"; rootLabel = "NIXOS";
extraTTYs = [7 8]; # manual, rogue extraTTYs = [7 8]; # manual, rogue
extraModulePackages = pkgs: [system.kernelPackages.aufs]; extraModulePackages = [system.kernelPackages.aufs];
kernelPackages = pkgs: pkgs.kernelPackages_2_6_25; kernelPackages = pkgs.kernelPackages_2_6_25;
initrd = { initrd = {
extraKernelModules = [ extraKernelModules = [
@ -172,7 +172,7 @@ rec {
}; };
environment = { environment = {
extraPackages = pkgs: [ extraPackages = [
pkgs.vim pkgs.vim
pkgs.subversion # for nixos-checkout pkgs.subversion # for nixos-checkout
pkgs.w3m # needed for the manual anyway pkgs.w3m # needed for the manual anyway

2
system/options.nix
View File

@ -16,7 +16,7 @@ let
# backward here means that expression could either be a value or a # backward here means that expression could either be a value or a
# function which expects to have a pkgs argument. # function which expects to have a pkgs argument.
optionalPkgs = name: x: optionalPkgs = name: x:
if __isFunction x if builtins.isFunction x
then obsolete "notation" (name: x pkgs) name then obsolete "notation" (name: x pkgs) name
else x; else x;