Remove pkgs argument of:

- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551

system/fonts.nix

@@ -23,4 +23,4 @@
 
 ++ pkgs.lib.optional (config.fonts.enableGhostscriptFonts) "${pkgs.ghostscript}/share/ghostscript/fonts"
 
-++ ((config.fonts.extraFonts) pkgs)
+++ config.fonts.extraFonts

system/options.nix

@@ -6,21 +6,14 @@ let
 
   # temporary modifications.
   # backward here means that expression could either be a value or a
-  # function which expects to have a pkgs argument.  Old merges are
+  # function which expects to have a pkgs argument.
-  # currently used while removing pkgs arguments.
   optionalPkgs = x:
     if __isFunction x then x pkgs else x;
 
-  backwardPkgsFunListOldMerge = name: list: ignorePkgs:
+  backwardPkgsFunListMerge = name: list:
-    backwardPkgsFunListNewMerge name list;
-
-  backwardPkgsFunListNewMerge = name: list:
     pkgs.lib.concatMap optionalPkgs list;
 
-  backwardPkgsFunOldMerge = name: list: ignorePkgs:
+  backwardPkgsFunMerge = name: list:
-    backwardPkgsFunNewMerge name list;
-
-  backwardPkgsFunNewMerge = name: list:
     if list != [] && tail list == []
     then optionalPkgs (head list)
     else abort "${name}: Defined at least twice.";
@@ -102,9 +95,9 @@ in
     };
 
     kernelPackages = mkOption {
-      default = pkgs: pkgs.kernelPackages;
+      default = pkgs.kernelPackages;
-      example = pkgs: pkgs.kernelPackages_2_6_25;
+      example = pkgs.kernelPackages_2_6_25;
-      merge = backwardPkgsFunOldMerge;
+      merge = backwardPkgsFunMerge;
       description = "
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
@@ -167,12 +160,12 @@ in
     };
 
     extraModulePackages = mkOption {
-      default = pkgs: [];
+      default = [];
-      # !!! example = pkgs: [pkgs.aufs pkgs.nvidiaDrivers];
+      # !!! example = [pkgs.aufs pkgs.nvidiaDrivers];
       description = ''
         A list of additional packages supplying kernel modules.
       '';
-      merge = backwardPkgsFunListOldMerge;
+      merge = backwardPkgsFunListMerge;
     };
 
     kernelModules = mkOption {
@@ -1407,8 +1400,8 @@ in
       };
 
       packageFun = mkOption {
-        default = pkgs: pkgs.xorg;
+        default = pkgs.xorg;
-        merge = backwardPkgsFunOldMerge;
+        merge = backwardPkgsFunMerge;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
@@ -2701,8 +2694,8 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     extraFonts = mkOption {
-      default = pkgs: [];
+      default = [];
-      merge = backwardPkgsFunListOldMerge;
+      merge = backwardPkgsFunListMerge;
       description = "
         Function, returning list of additional fonts.
       ";
@@ -2786,9 +2779,9 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     extraPackages = mkOption {
-      default = pkgs: [];
+      default = [];
-      example = pkgs: [pkgs.firefox pkgs.thunderbird];
+      example = [pkgs.firefox pkgs.thunderbird];
-      merge = backwardPkgsFunListOldMerge;
+      merge = backwardPkgsFunListMerge;
       description = "
         This option allows you to add additional packages to the system
         path.  These packages are automatically available to all users,
@@ -2803,9 +2796,9 @@ root        ALL=(ALL) SETENV: ALL
     };
 
     nix = mkOption {
-      default = pkgs: pkgs.nixUnstable;
+      default = pkgs.nixUnstable;
-      example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
+      example = pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = backwardPkgsFunOldMerge;
+      merge = backwardPkgsFunMerge;
       description = "
         Use non-default Nix easily. Be careful, though, not to break everything.
       ";

system/system.nix

@@ -29,9 +29,9 @@ rec {
 
   manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
 
-  nix = config.environment.nix pkgs;
+  nix = config.environment.nix;
 
-  kernelPackages = config.boot.kernelPackages pkgs;
+  kernelPackages = config.boot.kernelPackages;
 
   kernel = kernelPackages.kernel;
 
@@ -46,7 +46,7 @@ rec {
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ config.boot.extraModulePackages pkgs
+    ++ config.boot.extraModulePackages
   );
 
 
@@ -217,7 +217,7 @@ rec {
   ++ pkgs.lib.optional config.services.avahi.enable pkgs.avahi
   ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
   ++ pkgs.lib.concatLists (map (job: job.extraPath) upstartJobs.jobs)
-  ++ config.environment.extraPackages pkgs
+  ++ config.environment.extraPackages
   ++ pkgs.lib.optional config.fonts.enableFontDir fontDir
   ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
 

upstart-jobs/xserver.nix

@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.packageFun pkgs;
+  xorg = cfg.packageFun;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;