From 6b2f1a0ce9605cf77e1b20dc00c1e4e54261551f Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 May 2009 10:58:24 +0000
Subject: [PATCH] lib.getAttr -> lib.attrByPath

svn path=/nixos/trunk/; revision=15695
---
 upstart-jobs/apache-httpd/default.nix  | 2 +-
 upstart-jobs/default.nix               | 8 ++++----
 upstart-jobs/kdm.nix                   | 8 ++++----
 upstart-jobs/new-proposal/tightvnc.nix | 2 +-
 upstart-jobs/xserver.nix               | 8 ++++----
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index ee15dc06f01..20eda6ecaac 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -13,7 +13,7 @@ let
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
-  extraModules = pkgs.lib.getAttr ["extraModules"] [] mainCfg;
+  extraModules = pkgs.lib.attrByPath ["extraModules"] [] mainCfg;
   extraForeignModules = pkgs.lib.filter builtins.isAttrs extraModules;
   extraApachaModules = pkgs.lib.filter (x :! (builtins.isAttrs x)) extraModules; # I'd prefer using builtins.isString here, but doesn't exist yet
 
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 411fc526d41..2216a564963 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -23,14 +23,14 @@ let
   newProposalJobs =
   (
   let
-    inherit (pkgs.lib) getAttr; 
+    inherit (pkgs.lib) attrByPath; 
     inherit (builtins) attrNames pathExists map;
-    services = getAttr [ "servicesProposal" ] {} config;
+    services = attrByPath [ "servicesProposal" ] {} config;
     nameToJobs = name : (
       (
       let p = ./new-proposal + "/${name}.nix";
           p2 = ./new-proposal + "/${name}/default.nix";
-          thisConfig = getAttr [ name ] {} services;
+          thisConfig = attrByPath [ name ] {} services;
           path = [name];
           args = confgiV : {
             inherit config pkgs thisConfig path;
@@ -60,7 +60,7 @@ let
                                 then let v = (__getAttr name thisConfig); in if opt ? apply then opt.apply v else v
                                 else if opt ? default then opt.default else abort "you need to specify the configuration option ${errorWhere name}"
                            else abort "unkown option ${errorWhere name}";
-          checkConfig = (pkgs.lib.getAttr ["environment" "checkConfigurationOptions"] 
+          checkConfig = (attrByPath ["environment" "checkConfigurationOptions"] 
                   optionDeclarations.environment.checkConfigurationOptions.default
                   config);
       in # TODO: pass path to checker so it can show full path in the abort case
diff --git a/upstart-jobs/kdm.nix b/upstart-jobs/kdm.nix
index 2d93ee2cd55..ec0e2164b85 100644
--- a/upstart-jobs/kdm.nix
+++ b/upstart-jobs/kdm.nix
@@ -5,7 +5,7 @@ let
   cfg = config.services.xserver;
   xorg = cfg.package;
   
-  inherit (pkgs.lib) optional isInList getAttr;
+  inherit (pkgs.lib) optional isInList attrByPath;
   stdenv = pkgs.stdenv;
   
   knownVideoDrivers = {
@@ -26,17 +26,17 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   modules = 
 
-    getAttr ["modulesFirst"] [] videoDriverModules
+    attrByPath ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputkeyboard
       xorg.xf86inputmouse
     ] 
-    ++ getAttr ["modules"] [] videoDriverModules
+    ++ attrByPath ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${pkgs.synaptics}/${xorg.xorgserver}" /*xorg.xf86inputevdev*/]);
 
 
diff --git a/upstart-jobs/new-proposal/tightvnc.nix b/upstart-jobs/new-proposal/tightvnc.nix
index 054828a5230..342910fc886 100644
--- a/upstart-jobs/new-proposal/tightvnc.nix
+++ b/upstart-jobs/new-proposal/tightvnc.nix
@@ -70,7 +70,7 @@
     };
   };
 
-  jobs = if (lib.getAttr ["services" "xfs" "enable"] false config) != true
+  jobs = if (lib.attrByPath ["services" "xfs" "enable"] false config) != true
     then abort "you need to enable xfs services = { xfs = { enable = true; }; } within your nixos/configuration.nix file"
     else
     [ ( rec {
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 775b7524743..105b79ef118 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (pkgs.lib) optional isInList getAttr;
+  inherit (pkgs.lib) optional isInList attrByPath;
   
   # Abbreviations.
   cfg = config.services.xserver;
@@ -32,7 +32,7 @@ let
   resolutions = map (res: ''"${toString res.x}x${toString res.y}"'') (cfg.resolutions);
   sessionType = cfg.sessionType;
 
-  videoDriverModules = getAttr [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
+  videoDriverModules = attrByPath [ videoDriver ] (throw "unknown video driver: `${videoDriver}'") knownVideoDrivers;
 
   
   sessionCmd =
@@ -52,12 +52,12 @@ let
 
     
   modules = 
-    getAttr ["modulesFirst"] [] videoDriverModules
+    attrByPath ["modulesFirst"] [] videoDriverModules
     ++ [
       xorg.xorgserver
       xorg.xf86inputevdev
     ]
-    ++ getAttr ["modules"] [] videoDriverModules
+    ++ attrByPath ["modules"] [] videoDriverModules
     ++ (optional cfg.synaptics.enable ["${xorg.xf86inputsynaptics}"]);