[Nix-commits] SVN commit: nix - r25697 - disnix/examples/HelloWorldExample/trunk/deployment/top-level

[Sander van der Burg]

Author: sandervanderburg
Date: Thu Jan 27 13:17:20 2011
New Revision: 25697
URL: https://svn.nixos.org/websvn/nix/?rev=25697&sc=1

Log:
Remove ugly with pkgs;

Modified:
   disnix/examples/HelloWorldExample/trunk/deployment/top-level/all-packages.nix

Modified: 
disnix/examples/HelloWorldExample/trunk/deployment/top-level/all-packages.nix
==============================================================================
--- 
disnix/examples/HelloWorldExample/trunk/deployment/top-level/all-packages.nix   
    Thu Jan 27 13:07:29 2011        (r25696)
+++ 
disnix/examples/HelloWorldExample/trunk/deployment/top-level/all-packages.nix   
    Thu Jan 27 13:17:20 2011        (r25697)
@@ -9,50 +9,52 @@
 , pkgs
 }:
 
-with pkgs;
-
 rec {
   HelloService = import ../pkgs/HelloService {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
   
   HelloWorldService = import ../pkgs/HelloWorldService {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
 
   HelloWorld = import ../pkgs/HelloWorld {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
   
   LookupConfig = if distribution == null || services == null then null else 
import ../pkgs/LookupConfig {
-    inherit stdenv libxslt distribution services;
+    inherit (pkgs) stdenv libxslt;
+    inherit distribution services;
   };
   
   LookupService = import ../pkgs/LookupService {
-    inherit stdenv apacheAnt axis2 LookupConfig;
+    inherit (pkgs) stdenv apacheAnt axis2;
+    inherit LookupConfig;
   };
 
   HelloWorldService2 = import ../pkgs/HelloWorldService2 {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
 
   HelloWorld2 = import ../pkgs/HelloWorld2 {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
   
   HelloMySQLDB = import ../pkgs/HelloMySQLDB {
-    inherit stdenv;
+    inherit (pkgs) stdenv;
   };    
   
   HelloDBService = import ../pkgs/HelloDBService {
-    inherit stdenv apacheAnt axis2;
+    inherit (pkgs) stdenv apacheAnt axis2;
   };
   
   HelloDBServiceWrapper = import ../pkgs/HelloDBService/wrapper.nix {
-    inherit stdenv HelloDBService;
+    inherit (pkgs) stdenv;
+    inherit HelloDBService;
   };
   
   LookupService2 = import ../pkgs/LookupService2 {
-    inherit stdenv apacheAnt axis2 LookupConfig;
+    inherit (pkgs) stdenv apacheAnt axis2;
+    inherit LookupConfig;
   };
 }
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits