* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

  function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644

60 files changed, 93 insertions, 93 deletions

diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix
index 48ab97d91064..cfb71690ad5d 100644
--- a/pkgs/os-specific/linux/915resolution/default.nix
+++ b/pkgs/os-specific/linux/915resolution/default.nix
@@ -7,5 +7,5 @@ stdenv.mkDerivation {
     sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq";
   };
   buildPhase = "rm *.o 915resolution; make";
-  installPhase = "ensureDir $out/sbin; cp 915resolution $out/sbin/";
+  installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/";
 }
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 1a9b3cbf74dc..925e2e2e6501 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation {
  
   installPhase = ''
     kernelVersion=$(cd ${kernel}/lib/modules && ls)
-    ensureDir $out/lib/modules/$kernelVersion/misc
+    mkdir -p $out/lib/modules/$kernelVersion/misc
     cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp test_off.sh $out/bin/test_discrete_video_off.sh
   '';
 
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index 1fd6234b48e2..b05093d89157 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -136,7 +136,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
 
 { # install
 
-  ensureDir $out/lib/xorg
+  mkdir -p $out/lib/xorg
 
   cp -r common/usr/include $out
   cp -r common/usr/sbin $out
@@ -152,7 +152,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
   cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
 
   t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
-  ensureDir $t
+  mkdir -p $t
 
   cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t
 
@@ -174,7 +174,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
 }
 
 { # build samples
-  ensureDir $out/bin
+  mkdir -p $out/bin
 
   mkdir -p samples
   cd samples
diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix
index f6a3a6dffc26..1539775a2a17 100644
--- a/pkgs/os-specific/linux/aufs/2.1.nix
+++ b/pkgs/os-specific/linux/aufs/2.1.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/lib/modules/${kernel.version}/misc
+      mkdir -p $out/lib/modules/${kernel.version}/misc
       cp -v aufs.ko $out/lib/modules/${kernel.version}/misc
 
       # Install the headers because aufs2.1-util requires them.
diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix
index 696ed57b8603..4d80ddae0b87 100644
--- a/pkgs/os-specific/linux/aufs/2.nix
+++ b/pkgs/os-specific/linux/aufs/2.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/lib/modules/${kernel.version}/misc
+      mkdir -p $out/lib/modules/${kernel.version}/misc
       cp aufs.ko $out/lib/modules/${kernel.version}/misc
 
       # Install the headers because aufs2-util requires them.
diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix
index ec3c5aec85ba..731098134b58 100644
--- a/pkgs/os-specific/linux/aufs/3.nix
+++ b/pkgs/os-specific/linux/aufs/3.nix
@@ -22,11 +22,11 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
+      mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc
       cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc
 
       # Install the headers because aufs3-util requires them.
-      ensureDir $out/include/linux
+      mkdir -p $out/include/linux
       cp -v usr/include/linux/aufs_type.h $out/include/linux
     '';
 
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 9749b1568e46..39cc2dd40800 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     ''
       binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
       docDir="$out/share/doc/broadcom-sta/"
-      ensureDir "$binDir" "$docDir"
+      mkdir -p "$binDir" "$docDir"
       cp wl.ko "$binDir"
       cp lib/LICENSE.txt "$docDir"
     '';
diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/pkgs/os-specific/linux/cramfsswap/builder.sh
index 14e6a11f9d05..51a5b11dda69 100644
--- a/pkgs/os-specific/linux/cramfsswap/builder.sh
+++ b/pkgs/os-specific/linux/cramfsswap/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
 export DESTDIR=$out
-ensureDir $out/usr/bin
+mkdir -p $out/usr/bin
 
 genericBuild
diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix
index da5e00e33772..a7fb22f95e98 100644
--- a/pkgs/os-specific/linux/exmap/default.nix
+++ b/pkgs/os-specific/linux/exmap/default.nix
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
   #checkPhase = "make test"
 
   installPhase = ''
-    ensureDir "$out/share/${name}"
+    mkdir -p "$out/share/${name}"
     cp kernel/*.ko "$out/share/${name}"
 
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp src/{gexmap,exmtool,elftool,showproc} "$out/bin"
   '';
 
diff --git a/pkgs/os-specific/linux/ext3cow-tools/builder.sh b/pkgs/os-specific/linux/ext3cow-tools/builder.sh
index 560b8d6723ab..be6e3d9ce3ad 100755
--- a/pkgs/os-specific/linux/ext3cow-tools/builder.sh
+++ b/pkgs/os-specific/linux/ext3cow-tools/builder.sh
@@ -13,7 +13,7 @@ sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h		#
 
 make
 
-ensureDir $out/bin/
+mkdir -p $out/bin/
 cp ss $out/bin/snapshot
 cp tt $out/bin/
 cp e2d $out/bin/
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 6ad2227ee69e..f468b183be95 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patchPhase = "rm -rf debian defines TODO";
 
-  installPhase = "ensureDir $out && cp -ra * $out/";
+  installPhase = "mkdir -p $out && cp -ra * $out/";
 
   # repeat the same trick for radeon, 3com, etc.
   postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi";
diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
index 2ffa8c3e8375..3548a841aab0 100644
--- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   # says: "Your rights to redistribute the Software shall be
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
-  installPhase = "ensureDir $out; cp * $out";
+  installPhase = "mkdir -p $out; cp * $out";
   
   meta = {
     # "... you may transfer a copy of the Software ... provided such
diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
index ed6a82e0df7b..402636862eca 100644
--- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix
+++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   # says: "Your rights to redistribute the Software shall be
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
-  installPhase = "ensureDir $out; cp * $out";
+  installPhase = "mkdir -p $out; cp * $out";
   
   meta = {
     # "... you may transfer a copy of the Software ... provided such
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
index c09bd5c5aca9..2660c0b2493d 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
index 389d416f2a5d..afe2357995c2 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   buildPhase = "true";
 
-  installPhase = "ensureDir $out; chmod -x *; cp * $out";
+  installPhase = "mkdir -p $out; chmod -x *; cp * $out";
   
   meta = {
     description = "Firmware for the Intel 3945ABG wireless card";
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
index b75eae6acf21..3e3ad74adb34 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
 
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
index 0948d381f7f1..e1771c7a5cfb 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
index 8dc69e0a6a3c..b8ee5f388d19 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
index 0505a940d263..0d409bd8427c 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
index 5b7e2dc7b5e4..e5f3effa4b73 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
index 80aa6d367be7..e5fe73ca4984 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
index 580af83ea9de..b3a2a810bf7d 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     chmod -x *
     cp * "$out"
   '';
diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix
index 23513d2bf885..abf12fd672b7 100644
--- a/pkgs/os-specific/linux/firmware/ralink/default.nix
+++ b/pkgs/os-specific/linux/firmware/ralink/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp $src/*.bin $out
     cp $src/LICENSE $out/ralink.LICENSE
   '';
diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix
index 0c8accd2f6c5..0a1cb6555726 100644
--- a/pkgs/os-specific/linux/firmware/rt2860/default.nix
+++ b/pkgs/os-specific/linux/firmware/rt2860/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp $src/rt2860.bin $out
     cp $src/LICENSE $out/rt2860.LICENSE
   '';
diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix
index 388d3a503436..15de7c30586b 100644
--- a/pkgs/os-specific/linux/firmware/rt2870/default.nix
+++ b/pkgs/os-specific/linux/firmware/rt2870/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   # says: "Your rights to redistribute the Software shall be
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
-  installPhase = "ensureDir $ou