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

function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
parent f7159c195a
commit c556a6ea46
629 changed files with 931 additions and 939 deletions
@@ -31,7 +31,7 @@ rec {
  phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
  fixTarget = a.fullDepEntry (''
    sed -i Makefile -e "s@/usr/local@$out@"
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
  '') ["doUnpack" "minInit" "defEnsureDir"];
      
  meta = {
@@ -16,5 +16,5 @@ stdenv.mkDerivation rec {

  preBuild = "cd finger";

-  preInstall = '' ensureDir $out/man/man1 $out/bin '';
+  preInstall = '' mkdir -p $out/man/man1 $out/bin '';
 }
@@ -11,9 +11,9 @@ stdenv.mkDerivation {
  buildInputs = [ which ];

  installPhase = ''
-    ensureDir $out/bin; cp cntlm $out/bin/;
-    ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/;
-    ensureDir $out/man/; cp doc/cntlm.1 $out/man/;
+    mkdir -p $out/bin; cp cntlm $out/bin/;
+    mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/;
+    mkdir -p $out/man/; cp doc/cntlm.1 $out/man/;
  '';

  meta = {
@@ -15,7 +15,7 @@ buildPerlPackage {
  ''; 

  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp ddclient $out/bin
  '';

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
  buildInputs = [ libpcap ncurses ];

  preInstall = ''
-    ensureDir $out/share/man/man8 $out/bin
+    mkdir -p $out/share/man/man8 $out/bin
  '';

  meta = { 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {

  preConfigure = ''
    prefix=$out/eggdrop
-    ensureDir $prefix
+    mkdir -p $prefix
  '';

  postConfigure = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  '';

  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp flvstreamer $out/bin
    cp streams $out/bin
    cp rtmpsrv $out/bin
@@ -11,8 +11,8 @@ let version = "20000331"; in

    preConfigure = ''
      makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g))
-      ensureDir "$out/bin"
-      ensureDir "$out/share/man/man1"
+      mkdir -p "$out/bin"
+      mkdir -p "$out/share/man/man1"
    '';

    installTargets = "install man";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  postInstall =
    ''
-      ensureDir $out/share/man/man3
+      mkdir -p $out/share/man/man3
      cp man3/miniupnpc.3 $out/share/man/man3/
    '';

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

  postInstall =
    ''
-      ensureDir $out/share/man/man1
+      mkdir -p $out/share/man/man1
      cp miniupnpd.1 $out/share/man/man1/
    '';

@@ -37,7 +37,7 @@ rec {
  '' ["doUnpack" "addInputs"];

  doDeploy = a.fullDepEntry ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
    cp netboot "$out/bin"
  '' ["defEnsureDir" "minInit"];
      
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  };

  preInstall = "
-    ensureDir $out/man/man{1,8} $out/sbin $out/bin
+    mkdir -p $out/man/man{1,8} $out/sbin $out/bin
  ";

  meta = {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
  preConfigure =
    ''
      configureFlags="$configureFlags --with-privsep-path=$out/empty"
-      ensureDir $out/empty
+      mkdir -p $out/empty
    '';

  postInstall =
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
      chmod +x $out/bin/ssh-copy-id
      cp contrib/ssh-copy-id.1 $out/share/man/man1/

-      ensureDir $out/etc/ssh
+      mkdir -p $out/etc/ssh
      cp moduli $out/etc/ssh/
    '';

@@ -1,9 +1,9 @@
 source $stdenv/setup

-ensureDir $out/jars
+mkdir -p $out/jars
 cp $src $out/jars/azureus.jar

-ensureDir $out/bin
+mkdir -p $out/bin
 cat > $out/bin/azureus <<EOF
 #! $SHELL -e
 azureusHome=$out
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
  buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];

  postInstall = ''
-    ensureDir $out/share/man/man1
+    mkdir -p $out/share/man/man1
    mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1
  '';

@@ -66,7 +66,7 @@ buildPythonPackage {
    # something writable doesn't help; providing $FONTCONFIG_FILE doesn't
    # help either.  So we just don't run `make' under `docs/'.

-    ensureDir "$out/share/doc/${name}"
+    mkdir -p "$out/share/doc/${name}"
    cp -rv "docs/"* "$out/share/doc/${name}"
    find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \;

@@ -32,7 +32,7 @@ rec {

  installProgram = a.fullDepEntry(''
    mv "$out/share/philter/".*rc "$out/share/philter/philterrc"
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
    cp "$out/share/philter/src/philter.py" "$out/bin/philter"
    chmod a+x "$out/bin/philter"
  '') ["addInputs" "copyToShare" "minInit"];
@@ -30,7 +30,7 @@ rec {
  phaseNames = ["fixTarget" "doMakeInstall"];
  fixTarget = a.fullDepEntry (''
    sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@"
-    ensureDir "$out/bin" "$out/man/man1"
+    mkdir -p "$out/bin" "$out/man/man1"
  '') ["doUnpack" "minInit" "defEnsureDir"];
      
  meta = {
@@ -32,7 +32,7 @@ rec {
  '') ["minInit" "doUnpack"];

  makeDirs = a.fullDepEntry(''
-    ensureDir $out/share/${name}/etc/ppp
+    mkdir -p $out/share/${name}/etc/ppp
  '') ["minInit" "defEnsureDir"];

  name = "rp-pppoe-" + version;
@@ -12,12 +12,12 @@ stdenv.mkDerivation {

  installPhase =
    ''
-      ensureDir $out/libexec/s3sync
+      mkdir -p $out/libexec/s3sync
      cp *.rb $out/libexec/s3sync
      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd
      makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync

-      ensureDir $out/share/doc/s3sync
+      mkdir -p $out/share/doc/s3sync
      cp README* $out/share/doc/s3sync/
    ''; # */

@@ -29,7 +29,7 @@ rec {
  phaseNames = ["doConfigure" "createDirs" "doMakeInstall"];

  createDirs = a.fullDepEntry ''
-    ensureDir "$out/"{bin,lib,share/man,etc}
+    mkdir -p "$out/"{bin,lib,share/man,etc}
  '' ["defEnsureDir"];

  meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
  '';

  installPhase = ''
-    ensureDir $out/share/slimrat $out/bin
+    mkdir -p $out/share/slimrat $out/bin
    cp -R src/* $out/share/slimrat
    # slimrat-gui does not work (it needs the Gtk2 perl package)
    for i in slimrat; do
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
  '';

  installPhase = ''
-    ensureDir $out/{bin,man/man8,man/man1}
+    mkdir -p $out/{bin,man/man8,man/man1}
    cp client $out/bin/stun
    cp server $out/bin/stund
    cp debian/manpages/stund.8 $out/man/man8
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  installPhase =
    '' make install prefix="$out"

-       ensureDir "$out/share/${name}"
+       mkdir -p "$out/share/${name}"
       cp -v default.sdf "$out/share/${name}"
       sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"

@@ -64,7 +64,7 @@ stdenv.mkDerivation {

  # manually copy tcc and include files.. see comment above
  installPhase = ''
-    ensureDir $out{,/sbin,/lib/tcng/include}
+    mkdir -p $out{,/sbin,/lib/tcng/include}
    make DESTDIR=$out install
    cp tcc/tcc $out/sbin
    cp tcc/*.tc $out/lib/tcng/include
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
  '';

  installPhase = ''
-    ensureDir $out/bin $out/lib $out/include
+    mkdir -p $out/bin $out/lib $out/include
    cp c-client/*.h c-client/linkage.c $out/include
    cp c-client/c-client.a $out/lib/libc-client.a
    cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  };

  preInstall = ''
-    ensureDir $out/man/man1 $out/bin
+    mkdir -p $out/man/man1 $out/bin
  '';

  meta = {
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {

  installPhase = ''
    python setup.py install --prefix=$out
-    ensureDir $out/share/other
+    mkdir -p $out/share/other
    cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default

    # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the