FullDepEntry -> fullDepEntry, PackEntry -> packEntry

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

8 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix
index 5a6df800451f3..0ece514c6fb85 100644
--- a/pkgs/misc/tex/texlive/aggregate.nix
+++ b/pkgs/misc/tex/texlive/aggregate.nix
@@ -5,7 +5,7 @@ rec {
 
   buildInputs = lib.closePropagation paths;
 
-  doAggregate = FullDepEntry (''
+  doAggregate = fullDepEntry (''
 
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix
index abeecffb5302f..5f4ffd5421188 100644
--- a/pkgs/misc/tex/texlive/beamer.nix
+++ b/pkgs/misc/tex/texlive/beamer.nix
@@ -9,7 +9,7 @@ rec {
   buildInputs = [texLive];
   propagatedBuildInputs = [texLiveLatexXColor texLivePGF];
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     ensureDir $out/share/texmf-dist/tex/latex/beamer
     cp -r * $out/share/texmf-dist/tex/latex/beamer 
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix
index 19c8b5566b90f..a147d69174301 100644
--- a/pkgs/misc/tex/texlive/cm-super.nix
+++ b/pkgs/misc/tex/texlive/cm-super.nix
@@ -7,7 +7,7 @@ rec {
   };
 
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     ensureDir $out/share/texmf/fonts/enc
     ensureDir $out/share/texmf/fonts/map
     ensureDir $out/share/texmf/fonts/type1/public/cm-super
diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix
index 11b4d15c0971e..e917cecf41e23 100644
--- a/pkgs/misc/tex/texlive/context.nix
+++ b/pkgs/misc/tex/texlive/context.nix
@@ -8,7 +8,7 @@ rec {
 
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     ensureDir $out/share/texmf
     cp -r * $out/share/texmf
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix
index 477de2e946e5a..38934facf45c1 100644
--- a/pkgs/misc/tex/texlive/default.nix
+++ b/pkgs/misc/tex/texlive/default.nix
@@ -17,7 +17,7 @@ rec {
 
   setupHook = ./setup-hook.sh;
 
-  doPreConfigure = FullDepEntry (''
+  doPreConfigure = fullDepEntry (''
     ensureDir $out
     ensureDir $out/nix-support 
     cp ${setupHook} $out/nix-support/setup-hook.sh
@@ -35,7 +35,7 @@ rec {
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
   '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
 
-  doPostInstall = FullDepEntry(''
+  doPostInstall = fullDepEntry(''
     mv $out/bin $out/libexec
     ensureDir $out/bin
     for i in $out/libexec/*/*; do
diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix
index 168b9706f2d0d..7ad4d9ad3e003 100644
--- a/pkgs/misc/tex/texlive/extra.nix
+++ b/pkgs/misc/tex/texlive/extra.nix
@@ -8,7 +8,7 @@ rec {
 
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     ensureDir $out/share
     cp -r texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix
index 01be99b95011d..e23aa7f24dfe3 100644
--- a/pkgs/misc/tex/texlive/pgf.nix
+++ b/pkgs/misc/tex/texlive/pgf.nix
@@ -11,7 +11,7 @@ rec {
   propagatedBuildInputs = [texLiveLatexXColor texLive];
 
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     ensureDir $out/share/texmf/tex/generic/pgf
     cp -r * $out/share/texmf/tex/generic/pgf
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix
index dcbbbcb8af6cd..d6c8633dd320a 100644
--- a/pkgs/misc/tex/texlive/xcolor.nix
+++ b/pkgs/misc/tex/texlive/xcolor.nix
@@ -8,7 +8,7 @@ rec {
 
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
-  doCopy = FullDepEntry (''
+  doCopy = fullDepEntry (''
     export HOME=$PWD
 
     ensureDir $out/share/texmf/tex/latex/xcolor