FullDepEntry -> fullDepEntry, PackEntry -> packEntry

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

15 files changed, 23 insertions, 23 deletions

diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
index f34ad16c9ce1..bfd130a76102 100644
--- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
@@ -18,11 +18,11 @@ args : with args;
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
 let 
-doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
+doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
 	cd hal
 	patch -Np1 -i ${patchAR2425x86}
 '' else "") [minInit doUnpack];
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix
index b50041109927..c2d39072750d 100644
--- a/pkgs/os-specific/linux/atheros/0.9.4.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.4.nix
@@ -12,7 +12,7 @@ args : with args;
 	};
 	in with localDefs;
 let 
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix
index e26533738e34..41b06e70552c 100644
--- a/pkgs/os-specific/linux/atheros/r2756.nix
+++ b/pkgs/os-specific/linux/atheros/r2756.nix
@@ -18,12 +18,12 @@ args : with args;
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
 let 
-doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
+doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
 	cd hal
 	patch -Np1 -i ${patchAR2425x86}
 	cd ..
 '' else "") [minInit doUnpack];
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix
index 020dce8a9a46..f40761770b88 100644
--- a/pkgs/os-specific/linux/atheros/r3122.nix
+++ b/pkgs/os-specific/linux/atheros/r3122.nix
@@ -12,7 +12,7 @@ args : with args;
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
 let
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r3574.nix b/pkgs/os-specific/linux/atheros/r3574.nix
index c16fc1285ec0..7b97a235ae7b 100644
--- a/pkgs/os-specific/linux/atheros/r3574.nix
+++ b/pkgs/os-specific/linux/atheros/r3574.nix
@@ -12,7 +12,7 @@ args : with args;
 	} null; /* null is a terminator for sumArgs */
 	in with localDefs;
 let
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix
index bf8456787dd1..676298e59948 100644
--- a/pkgs/os-specific/linux/atheros/r3693.nix
+++ b/pkgs/os-specific/linux/atheros/r3693.nix
@@ -15,13 +15,13 @@ args : with args;
 	};
 	in with localDefs;
 let
-preBuild = FullDepEntry (''
+preBuild = fullDepEntry (''
 	echo Replacing HAL.
 	tar xvf ${hal20080528}
 	rm -r hal
 	mv ath_hal-* hal
 '') ["minInit" "doUnpack"];
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix
index d7dbe98893cb..3bc887e07176 100644
--- a/pkgs/os-specific/linux/atheros/r3837.nix
+++ b/pkgs/os-specific/linux/atheros/r3837.nix
@@ -16,13 +16,13 @@ args : with args;
 	};
 	in with localDefs;
 let
-preBuild = FullDepEntry (''
+preBuild = fullDepEntry (''
 	echo Replacing HAL.
 	tar xvf ${hal20080528}
 	rm -r hal
 	mv ath_hal-* hal
 '') ["minInit" "doUnpack"];
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix
index 62316d38b817..435981768957 100644
--- a/pkgs/os-specific/linux/atheros/r3867.nix
+++ b/pkgs/os-specific/linux/atheros/r3867.nix
@@ -16,13 +16,13 @@ args : with args;
 	};
 	in with localDefs;
 let
-preBuild = FullDepEntry (''
+preBuild = fullDepEntry (''
 	echo Replacing HAL.
 	tar xvf ${hal20080528}
 	rm -r hal
 	mv ath_hal-* hal
 '') ["minInit" "doUnpack"];
-postInstall = FullDepEntry (''
+postInstall = fullDepEntry (''
 	ln -s $out/usr/local/bin $out/bin
 '') [minInit doMakeInstall];
 in
diff --git a/pkgs/os-specific/linux/blcr/0.6.5.nix b/pkgs/os-specific/linux/blcr/0.6.5.nix
index c16be4f9c700..236afccf79a2 100644
--- a/pkgs/os-specific/linux/blcr/0.6.5.nix
+++ b/pkgs/os-specific/linux/blcr/0.6.5.nix
@@ -13,7 +13,7 @@ rec {
     "--with-system-map=${args.kernel}/System.map"
   ];
 
-  preConfigure = FullDepEntry (''
+  preConfigure = fullDepEntry (''
     sed -e 's/FASTCALL//' -i configure configure.ac
     sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
   '')["doUnpack" "minInit"];
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index 24c8255a61f3..8ded70dd44b6 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -16,7 +16,7 @@ rec {
   inherit buildInputs;
   configureFlags = [];
 
-  fixInc = a.FullDepEntry (''
+  fixInc = a.fullDepEntry (''
     sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp
   '') ["doUnpack" "minInit"];
 
diff --git a/pkgs/os-specific/linux/gw6c/default.nix b/pkgs/os-specific/linux/gw6c/default.nix
index a11037c0ebed..af8449f55db5 100644
--- a/pkgs/os-specific/linux/gw6c/default.nix
+++ b/pkgs/os-specific/linux/gw6c/default.nix
@@ -17,7 +17,7 @@ rec {
 
   goSrcDir = "cd tspc-advanced";
 
-  preBuild = FullDepEntry (''
+  preBuild = fullDepEntry (''
     sed -e 's@/dev/net/tun@/dev/tun@' -i platform/linux/tsp_tun.c;
     sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@' -i template/linux.sh
     sed -e 's@/sbin/route@${nettools}/sbin/route@' -i template/linux.sh
diff --git a/pkgs/os-specific/linux/jfsrec/svn-7.nix b/pkgs/os-specific/linux/jfsrec/svn-7.nix
index 48ec07bbe8ad..4f47d710e755 100644
--- a/pkgs/os-specific/linux/jfsrec/svn-7.nix
+++ b/pkgs/os-specific/linux/jfsrec/svn-7.nix
@@ -8,11 +8,11 @@ rec {
   buildInputs = [boost];
   configureFlags = [];
 
-  doFixBoost = FullDepEntry (''
+  doFixBoost = fullDepEntry (''
     sed -e 's/-lboost_[a-z_]*/&-mt/g' -i src/Makefile.in
   '') ["minInit" "doUnpack"];
 
-  doFixInc = FullDepEntry (''
+  doFixInc = fullDepEntry (''
     sed -e '/[#]include [<]config.h[>]/a\#include <string.h>' -i src/unicode_to_utf8.cpp
     cat src/unicode_to_utf8.cpp
   '') ["minInit" "doUnpack"];
diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
index f3bfe1a5c7bb..d9dc076d92f3 100644
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
@@ -8,10 +8,10 @@ rec {
 
   buildInputs = [];
   configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
-  debugStep = FullDepEntry (''
+  debugStep = fullDepEntry (''
   	cat config-host.mak
   '') ["minInit"];
-  preConfigure = FullDepEntry ('' 
+  preConfigure = fullDepEntry ('' 
     sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
     sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
     sed -e '/depmod/d' -i install.sh
diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
index c2724a57bd6c..75bb1e72d486 100644
--- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
+++ b/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
@@ -8,10 +8,10 @@ rec {
 
   buildInputs = [];
   configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
-  debugStep = FullDepEntry (''
+  debugStep = fullDepEntry (''
   	cat config-host.mak
   '') ["minInit"];
-  preConfigure = FullDepEntry ('' 
+  preConfigure = fullDepEntry ('' 
     sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh
     sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh
     sed -e '/depmod/d' -i install.sh
diff --git a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
index ccb4facc0789..a5c55bf98a7e 100644
--- a/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
+++ b/pkgs/os-specific/linux/xfsprogs/2.9.7-1.nix
@@ -8,7 +8,7 @@ rec {
   buildInputs = [libtool gettext e2fsprogs];
   configureFlags = [];
 
-  preConfigure = FullDepEntry (''
+  preConfigure = fullDepEntry (''
     sp_path=$(echo $PATH | sed -e 's/:/ /g');
     sed -e 's@/usr/bin@'"$PATH: $sp_path"'@g' -i configure
     sed -e 's@/usr/local/bin@'"$PATH: sp_path"'@g' -i configure