FullDepEntry -> fullDepEntry, PackEntry -> packEntry

svn path=/nixpkgs/trunk/; revision=15662

13 files changed, 24 insertions, 24 deletions

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 7186563eafc..8846a82bc7b 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -19,7 +19,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
 
-  preBuild = FullDepEntry (''
+  preBuild = fullDepEntry (''
     export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext'
     ensureDir $out/share
     tar xf ${fpc.src} --strip-components=1 -C $out/share
@@ -27,7 +27,7 @@ rec {
   '') 
   ["minInit" "defEnsureDir" "doUnpack"];
 
-  postInstall = FullDepEntry (''
+  postInstall = fullDepEntry (''
     wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'"
   '') ["doMakeInstall" "minInit" "defEnsureDir"];
 
diff --git a/pkgs/development/compilers/llvm/llvm-gcc.nix b/pkgs/development/compilers/llvm/llvm-gcc.nix
index 20090d4b1c6..a1f5e031eba 100644
--- a/pkgs/development/compilers/llvm/llvm-gcc.nix
+++ b/pkgs/development/compilers/llvm/llvm-gcc.nix
@@ -14,7 +14,7 @@ rec {
 
   patches = [ ./no-sys-dirs.patch ];
 
-  preConfigure = FullDepEntry (''
+  preConfigure = fullDepEntry (''
 
     sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \
         -e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \
@@ -53,7 +53,7 @@ rec {
   '') ["doUnpack" "minInit"];
   configureCommand = "$(ls ../llvm-gcc*.*.source/configure)";
 
-  postInstall = FullDepEntry (''
+  postInstall = fullDepEntry (''
     mv $out/bin/gcc $out/bin/llvm-gcc
     mv $out/bin/g++ $out/bin/llvm-g++
   '')["doMakeInstall" "minInit"];
diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix
index a1c9670be84..8b218d499c5 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/9.1.nix
@@ -13,7 +13,7 @@ let
 	shell=stdenv.shell;
 in
 let 
-	allBuild = FullDepEntry ("
+	allBuild = fullDepEntry ("
 		(sleep 0.1; echo ) | clisp install.txt;
 		(sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp 
 		ensureDir \$out/share
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index c95e339d319..953d47e6b91 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -2,7 +2,7 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
   doPatchShebangs = args.doPatchShebangs;
 
   version = lib.getAttr ["version"] "2008.03.30" args; 
@@ -29,7 +29,7 @@ rec {
   phaseNames = ["preBuild" "doMakeInstall" "postInstall" (doPatchShebangs "$out/share/io/samples") 
     (doPatchShebangs "$out/lib/io")];
       
-  preBuild = FullDepEntry (''
+  preBuild = fullDepEntry (''
     for i in $pkgs ${
         if args.stdenv ? glibc then args.stdenv.glibc else ""
       } ${
@@ -41,7 +41,7 @@ rec {
     done
   '') ["minInit" "addInputs" "doUnpack"];
 
-  postInstall = FullDepEntry (''
+  postInstall = fullDepEntry (''
     ensureDir $out/share/io
 
     ln -s $out/lib/io/addons $out/share/io
diff --git a/pkgs/development/interpreters/plt-scheme/default.nix b/pkgs/development/interpreters/plt-scheme/default.nix
index e78a0fdbb9e..94b59692160 100644
--- a/pkgs/development/interpreters/plt-scheme/default.nix
+++ b/pkgs/development/interpreters/plt-scheme/default.nix
@@ -15,7 +15,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
 
-  preConfigure = FullDepEntry (''
+  preConfigure = fullDepEntry (''
     sed -e 's@/usr/bin/uname@'"$(which uname)"'@g' -i configure
   '') ["minInit" "addInputs" "doUnpack"];
       
diff --git a/pkgs/development/interpreters/ruby/gems.nix b/pkgs/development/interpreters/ruby/gems.nix
index 9b24d582c18..d971ee22d65 100644
--- a/pkgs/development/interpreters/ruby/gems.nix
+++ b/pkgs/development/interpreters/ruby/gems.nix
@@ -9,7 +9,7 @@ rec {
   buildInputs = [ruby makeWrapper];
   configureFlags = [];
 
-  doInstall = FullDepEntry (''
+  doInstall = fullDepEntry (''
     ruby setup.rb --prefix=$out/
     wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib:$out/lib
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 84dff00a8b9..c54877946aa 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -2,7 +2,7 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
 
   version = lib.getAttr ["version"] "4.1.0" args; 
   buildInputs = with args; [
@@ -22,11 +22,11 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["genMakefile" "doMakeInstall" "demoInstall"];
 
-  genMakefile = FullDepEntry ''
+  genMakefile = fullDepEntry ''
     cmake -D CMAKE_INSTALL_PREFIX=$out . 
   '' ["minInit" "addInputs" "doUnpack"];
 
-  demoInstall = FullDepEntry(''
+  demoInstall = fullDepEntry(''
     ensureDir $out/bin
     cp chipmunk_demos $out/bin
   '') ["doMakeInstall" "defEnsureDir"];
diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix
index 649d0a5728f..55e235e180b 100644
--- a/pkgs/development/libraries/libcv/default.nix
+++ b/pkgs/development/libraries/libcv/default.nix
@@ -2,7 +2,7 @@ args :
 let 
   lib = args.lib;
   fetchurl = args.fetchurl;
-  FullDepEntry = args.FullDepEntry;
+  fullDepEntry = args.fullDepEntry;
 
   version = lib.getAttr ["version"] "" args; 
   buildInputs = with args; [
@@ -22,7 +22,7 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
 
-  postInstall = FullDepEntry (''
+  postInstall = fullDepEntry (''
     ln -s $out/include/opencv/* $out/include
   '') ["doMakeInstall" "minInit"];
       
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index df5eaafdf6d..07412d89ab6 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -17,13 +17,13 @@ rec {
   /* doConfigure should be specified separately */
   phaseNames = ["doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
 
-  doReplaceUsrBin = FullDepEntry (''
+  doReplaceUsrBin = fullDepEntry (''
     for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
         sed -e 's@/usr/bin/gcc@gcc@' -i $i
     done
   '') ["minInit" "doUnpack"];
 
-  doAddPrograms = FullDepEntry (''
+  doAddPrograms = fullDepEntry (''
     for i in Programs/.libs/*; do 
         cp $i $out/bin/webkit-program-$(basename $i)
     done
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index e6bd1b9e5a1..b94d6d69797 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -21,7 +21,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
-  postInstall = a.FullDepEntry (''
+  postInstall = a.fullDepEntry (''
     ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
   '') ["minInit"];
 
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 9afa28011de..e888161ded9 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -18,7 +18,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["mkDirs" "installPythonPackage"];
-  mkDirs = a.FullDepEntry(''
+  mkDirs = a.fullDepEntry(''
     ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
     export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
   '') ["defEnsureDir" "addInputs"];
diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
index d462cc3ab39..d33f7ac566c 100644
--- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
+++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
@@ -13,14 +13,14 @@ args : with args;	let
 		goSrcDir = "
 			cd ltrace-*;
 		";
-		preBuild = FullDepEntry (''
+		preBuild = fullDepEntry (''
 		  gunzip < ${patch} | patch -Np1
 		  sed -e s@-Werror@@ -i Makefile.in
 		'')["minInit" "doUnpack"];
 	};
 	in with localDefs;
 let
-	preConfigure = FullDepEntry ("
+	preConfigure = fullDepEntry ("
 		sed -e 's@-o root -g root@@' -i Makefile.in;
 	") [doUnpack minInit];
 in
diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix
index 92d071362f3..8100972d6ea 100644
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -18,17 +18,17 @@ rec {
       ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
   ];
 
-  prepareMainBuild = FullDepEntry (''
+  prepareMainBuild = fullDepEntry (''
     cd src 
     export QTDIR=${qt}/
     make -f Makefile.bootstrap makefile
   '') ["minInit" "doUnpack"];
 
-  fixInc = FullDepEntry(''
+  fixInc = fullDepEntry(''
     sed -e '1i\#include <stdlib.h>' -i resources.inline.h
   '') ["minInit" "doUnpack"];
 
-  deploy = FullDepEntry (''
+  deploy = fullDepEntry (''
     ensureDir $out/bin/
     cp ../bin/xxdiff $out/bin
     cd ..