From c556a6ea46e71e1907d78b71fab36df30297b3ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 18 Jan 2012 20:16:00 +0000
Subject: * "ensureDir" -> "mkdir -p".  "ensureDir" is a rather pointless  
 function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
---
 pkgs/applications/science/biology/arb/default.nix     | 8 ++++----
 pkgs/applications/science/biology/pal2nal/default.nix | 4 ++--
 pkgs/applications/science/biology/slr/default.nix     | 2 +-
 pkgs/applications/science/geometry/tetgen/default.nix | 2 +-
 pkgs/applications/science/logic/hol/default.nix       | 4 ++--
 pkgs/applications/science/logic/hol_light/default.nix | 2 +-
 pkgs/applications/science/logic/iprover/default.nix   | 4 ++--
 pkgs/applications/science/logic/isabelle/default.nix  | 2 +-
 pkgs/applications/science/logic/leo2/default.nix      | 6 +++---
 pkgs/applications/science/logic/matita/default.nix    | 2 +-
 pkgs/applications/science/logic/minisat/default.nix   | 2 +-
 pkgs/applications/science/logic/picosat/default.nix   | 6 +++---
 pkgs/applications/science/logic/prover9/default.nix   | 2 +-
 pkgs/applications/science/logic/satallax/default.nix  | 6 +++---
 pkgs/applications/science/logic/ssreflect/default.nix | 2 +-
 pkgs/applications/science/logic/tptp/default.nix      | 4 ++--
 pkgs/applications/science/math/content/default.nix    | 2 +-
 pkgs/applications/science/math/eukleides/default.nix  | 2 +-
 pkgs/applications/science/math/maxima/default.nix     | 2 +-
 pkgs/applications/science/math/msieve/default.nix     | 2 +-
 pkgs/applications/science/math/singular/default.nix   | 2 +-
 21 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'pkgs/applications/science')

diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix
index 4543fce48160..1b4563555c46 100644
--- a/pkgs/applications/science/biology/arb/default.nix
+++ b/pkgs/applications/science/biology/arb/default.nix
@@ -33,22 +33,22 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
     shareddir=/nix/var/lib/arb
     # link out writable shared location lib/pts
-    ensureDir $shareddir/lib/pts
+    mkdir -p $shareddir/lib/pts
     cp -vau lib/pts $shareddir/lib
     rm -vrf lib/pts
     ln -vs $shareddir/lib/pts $out/lib/pts
     chmod a+rwx $shareddir/lib/pts
     # link out writable shared location lib/nas/
-    ensureDir $shareddir/lib/nas
+    mkdir -p $shareddir/lib/nas
     cp -vau lib/nas $shareddir/lib
     rm -vrf lib/nas
     ln -vs $shareddir/lib/nas $out/lib/nas
     chmod a+rwx $shareddir/lib/nas
     # link out shared lib/pixmaps (not sure about this, yet):
-    ensureDir $shareddir/lib/pixmaps
+    mkdir -p $shareddir/lib/pixmaps
     cp -vau lib/pixmaps $shareddir/lib
     rm -vrf lib/pixmaps
     ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps
diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix
index ff9e35d92164..956f8b07e989 100644
--- a/pkgs/applications/science/biology/pal2nal/default.nix
+++ b/pkgs/applications/science/biology/pal2nal/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
 
     cp -v pal2nal.pl $out/bin 
 
-    ensureDir $out/doc
+    mkdir -p $out/doc
 
     cp -v README $out/doc
   '';
diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix
index 981cf2a67031..629c10aecdff 100644
--- a/pkgs/applications/science/biology/slr/default.nix
+++ b/pkgs/applications/science/biology/slr/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     make -fMakefile.linux
   '';
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp -v ../Slr $out/bin 
   '';
 
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index a5c3466d57bc..a43ec3b0eb9f 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp tetgen $out/bin
   '';
 
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 63040b7fdd52..5552fadc5559 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [polyml];
 
   buildCommand = ''
-    ensureDir "$out/src"
+    mkdir -p "$out/src"
     cd  "$out/src"
 
     tar -xzf "$src"
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     
     bin/build -expk -symlink
 
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     ln -st $out/bin  $out/src/hol/bin/*
     # ln -s $out/src/hol/bin $out/bin
   '';
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 4961bbeabfd1..0e688e71a2e5 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir "$out/lib/hol_light" "$out/bin"
+    mkdir -p "$out/lib/hol_light" "$out/bin"
     cp -a  . $out/lib/hol_light
     echo "${start_script}" > "$out/bin/hol_light"
     chmod a+x "$out/bin/hol_light"
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 7bfd8dff12e3..91d8c122a8d4 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -30,10 +30,10 @@ rec {
   phaseNames = ["doConfigure" "doMake" "doDeploy"];
   configureCommand = "sh configure";
   doDeploy = a.fullDepEntry (''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp iproveropt "$out/bin"
 
-    ensureDir "$out/share/${name}"
+    mkdir -p "$out/share/${name}"
     cp *.p "$out/share/${name}"
     echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover
     chmod a+x  "$out"/bin/iprover
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 7cfe5f927363..4a268cac6455 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     mv $TMP/$name $out
     cd $out/$name
     bin/isabelle install -p $out/bin
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index 04ab9a5b5ab3..6b17d7e8f50a 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -29,17 +29,17 @@ rec {
   phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"];
 
   makeInstallationDir = a.fullDepEntry (''
-    ensureDir "$out/share/leo2/build-dir"
+    mkdir -p "$out/share/leo2/build-dir"
     cd "$out/share/leo2/build-dir"
   '') ["minInit" "defEnsureDir"];
 
   goSrcDir = "cd src/";
 
   doFinalize = a.fullDepEntry (''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo"
     chmod a+x "$out/bin/leo"
-    ensureDir "$out/etc"
+    mkdir -p "$out/etc"
     echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc"
   '') ["minInit" "doMake" "defEnsureDir"];
 
diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix
index 92e9479d9a44..0713ff09e929 100644
--- a/pkgs/applications/science/logic/matita/default.nix
+++ b/pkgs/applications/science/logic/matita/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   '';
 
   postInstall = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
   '';
 
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix
index 34a6bd7ceff3..1f29b3aa1a11 100644
--- a/pkgs/applications/science/logic/minisat/default.nix
+++ b/pkgs/applications/science/logic/minisat/default.nix
@@ -29,7 +29,7 @@ rec {
   phaseNames = ["setVars" "doMake" "doDeploy"];
   goSrcDir = "cd simp";
   doDeploy = a.fullDepEntry (''
-    ensureDir "$out"/bin
+    mkdir -p "$out"/bin
     cp minisat_static "$out/bin"/minisat
   '') ["minInit" "defEnsureDir"];
   makeFlags = ["rs"];
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index 5a92c103961c..970daf739fca 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-   ensureDir "$out"/bin
+   mkdir -p "$out"/bin
    cp picomus "$out"/bin
    cp picosat "$out"/bin
-   ensureDir "$out"/lib
+   mkdir -p "$out"/lib
    cp libpicosat.a "$out"/lib
    cp libpicosat.so "$out"/lib
-   ensureDir "$out"/include/picosat
+   mkdir -p "$out"/include/picosat
    cp picosat.h "$out"/include/picosat
   '';
 
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 129abef0b3d7..7ac3831f6a56 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildFlags = "all";
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp bin/* $out/bin
   '';
 
diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 4bf6e53737e9..2126a4d76d63 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -34,21 +34,21 @@ rec {
       make
     )
 
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp minisat/simp/minisat "$out/bin"
 
     echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp
 
   '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
   doDeploy = a.fullDepEntry (''
-    ensureDir "$out/share/satallax/build-dir"
+    mkdir -p "$out/share/satallax/build-dir"
     cp -r * "$out/share/satallax/build-dir"
     cd  "$out/share/satallax/build-dir"
 
     sbcl --load make.lisp
     ! ( ./test | grep ERROR )
     
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp bin/satallax "$out/bin"
   '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
       
diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix
index 5a51fe2136a1..8443974a0a0a 100644
--- a/pkgs/applications/science/logic/ssreflect/default.nix
+++ b/pkgs/applications/science/logic/ssreflect/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     COQLIB=$out/lib/coq make -f Makefile.coq install -e
-    ensureDir $out/bin
+    mkdir -p $out/bin
   '';
 
   meta = {
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 3211b6ebdc01..11b8f7ce535a 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -31,7 +31,7 @@ rec {
     "patchBinaries" "makeLinks"];
 
   goTarget = a.fullDepEntry ''
-    ensureDir "$out"/share/
+    mkdir -p "$out"/share/
     cd "$out"/share/
   '' ["defEnsureDir" "minInit"];
 
@@ -54,7 +54,7 @@ rec {
   '' ["addInputs"];
 
   makeLinks = a.fullDepEntry ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     ln -s "../share/tptp/TPTP2X/tptp2X" "$out/bin"
     ln -s "../share/tptp/Scripts/tptp2T" "$out/bin"
     ln -s "../share/tptp/Scripts/tptp4X" "$out/bin"
diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
index 15abc928f0fb..87c047c29957 100644
--- a/pkgs/applications/science/math/content/default.nix
+++ b/pkgs/applications/science/math/content/default.nix
@@ -77,7 +77,7 @@ rec {
   '') ["addInputs" "buildVibrant" "setPlatform"];
 
   install = a.fullDepEntry (''
-    ensureDir $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc
+    mkdir -p $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc
     find . -name '*.o' -exec cp '{}' $out/lib ';'
     find . -name '*.so' -exec cp '{}' $out/lib ';'
     find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix
index 9f65bcb8c148..d15bed8476e7 100644
--- a/pkgs/applications/science/math/eukleides/default.nix
+++ b/pkgs/applications/science/math/eukleides/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [bison flex texinfo readline texLive];
 
   preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile";
-  installPhase = "ensureDir $out/bin ; make PREFIX=$out install";
+  installPhase = "mkdir -p $out/bin ; make PREFIX=$out install";
 
   meta = {
     description = "Geometry Drawing Language";
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 02b7017d2953..0d3a12b38c28 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
       wrapProgram "$prog" --prefix PATH ":" "${searchPath}"
     done
     # Move emacs modules and documentation into the right place.
-    ensureDir $out/share/emacs $out/share/doc
+    mkdir -p $out/share/emacs $out/share/doc
     ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp
     ln -s ../maxima/${version}/doc $out/share/doc/maxima
   '';
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index baee2f23d4ca..c8b388a06b78 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/pkgs/applications/science/math/msieve/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
                else if stdenv.system == "i686-linux" then "x86"
                else "generic";
 
-  installPhase = ''ensureDir $out/bin/
+  installPhase = ''mkdir -p $out/bin/
                    cp msieve $out/bin/'';
 
   meta = {
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index dfc97eca8ebe..5c5dfae8200f 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -37,7 +37,7 @@ rec {
   fixInstall = a.fullDepEntry (''
     rm -rf "$out/LIB"
     cp -r Singular/LIB "$out"
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     ln -s "$out"/*/Singular "$out/bin"
   '') ["minInit" "defEnsureDir"];
       
-- 
cgit 1.4.1