summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/fossil/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/fast-export/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/git-git.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/stgit/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/topgit/default.nix4
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix4
-rw-r--r--pkgs/applications/version-management/monotone/default.nix4
-rw-r--r--pkgs/applications/version-management/veracity/default.nix10
-rw-r--r--pkgs/applications/version-management/viewmtn/0.10.nix6
10 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 7b84dcecb63..325d2e77e1a 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     INSTALLDIR=$out/bin make install
   '';
 
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 45860362433..44e9cd535be 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   installPhase = ''
     sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py
     l=$out/libexec/git-fast-export
-    ensureDir $out/{bin,doc/git-fast-export} $l
+    mkdir -p $out/{bin,doc/git-fast-export} $l
     mv *.txt $out/doc/git-fast-export
     sed -i "s@ROOT=.*@ROOT=$l@" *.sh
     mv *.sh $out/bin
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 795d43da6da..f22fbd102c7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -42,11 +42,11 @@ stdenv.mkDerivation {
       }
 
       # Install contrib stuff.
-      ensureDir $out/share/git
+      mkdir -p $out/share/git
       mv contrib $out/share/git/
-      ensureDir $out/share/emacs/site-lisp
+      mkdir -p $out/share/emacs/site-lisp
       ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
-      ensureDir $out/etc/bash_completion.d
+      mkdir -p $out/etc/bash_completion.d
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/
 
       # grep is a runtime dependence, need to patch so that it's found
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
index a3b2a60953a..6371e504bfb 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     ''
       # Install Emacs mode.
       echo "installing Emacs mode..."
-      ensureDir $out/share/emacs/site-lisp
+      mkdir -p $out/share/emacs/site-lisp
       cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
 
       wrapArgs=
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
    + ''# install bash completion script
       d="$out/etc/bash_completion.d"
-      ensureDir $d; cp contrib/completion/git-completion.bash "$d"
+      mkdir -p $d; cp contrib/completion/git-completion.bash "$d"
      '';
 
   meta = {
diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 7d622c4067c..a933ae84e60 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   makeFlags = "prefix=$$out";
 
   postInstall = ''
-    ensureDir "$out/etc/bash_completion.d/"
+    mkdir -p "$out/etc/bash_completion.d/"
     ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/"
   '';
 
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index ef8bb1b4dcf..4b192605182 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -16,9 +16,9 @@ stdenv.mkDerivation {
   configurePhase = "export prefix=$out";
 
   postInstall = ''
-    ensureDir "$out/share/doc/topgit-${version}"
+    mkdir -p "$out/share/doc/topgit-${version}"
     cp README "$out/share/doc/topgit-${version}/"
-    ensureDir "$out/etc/bash_completion.d"
+    mkdir -p "$out/etc/bash_completion.d"
     make prefix="$out" install
     mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/"
   '';
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 8d4a45a496c..a5e4eb8e280 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   postInstall = (stdenv.lib.optionalString guiSupport
     ''
-      ensureDir $out/etc/mercurial
+      mkdir -p $out/etc/mercurial
       cp contrib/hgk $out/bin
       cat >> $out/etc/mercurial/hgrc << EOF
       [extensions]
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       done
 
       # copy hgweb.cgi to allow use in apache
-      ensureDir $out/share/cgi-bin
+      mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi $out/share/cgi-bin
       chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 70dd669e30f..cde31b5cef9 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig];
 
   postInstall = ''
-    ensureDir $out/share/${name}
+    mkdir -p $out/share/${name}
     cp -rv contrib/ $out/share/${name}/contrib
-    ensureDir $out/lib/perl5/site_perl/${perlVersion}
+    mkdir -p $out/lib/perl5/site_perl/${perlVersion}
     cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion}
   '';
 
diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
index b4aa63ed014..91650deb077 100644
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -37,10 +37,10 @@ rec {
   '' else "") ["doMake" "minInit"];
 
   prepare_sgneeds = a.fullDepEntry (''
-    ensureDir "$out/sgneeds/include/spidermonkey"
+    mkdir -p "$out/sgneeds/include/spidermonkey"
     for d in bin include lib; do 
-      ensureDir "$out/sgneeds/$d"
-      ensureDir "$out/sgneeds/$d"
+      mkdir -p "$out/sgneeds/$d"
+      mkdir -p "$out/sgneeds/$d"
       for p in "${spidermonkey_1_8_0rc1}"; do
         for f in "$p"/"$d"/*; do
 	  ln -sf "$f" "$out"/sgneeds/"$d"
@@ -53,7 +53,7 @@ rec {
 	done
       done
 
-    ensureDir "$out/sgneeds/include/sgbrings"
+    mkdir -p "$out/sgneeds/include/sgbrings"
     ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
     for f in "$out/sgneeds/lib/"libjs*; do
       bn="$(basename "$f")"
@@ -84,7 +84,7 @@ rec {
   '' ["minInit"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out/bin" "$out/share/veracity/"
+    mkdir -p "$out/bin" "$out/share/veracity/"
     cp -r .. "$out/share/veracity/build-dir"
     ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
     ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
index a8ced15b58c..d5e7d1e7c83 100644
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ b/pkgs/applications/version-management/viewmtn/0.10.nix
@@ -26,9 +26,9 @@ rec {
 
     fullOut=$(toPythonPath $out)
     
-    ensureDir $fullOut
-    ensureDir $out/bin
-    ensureDir $out/share/viewmtn
+    mkdir -p $fullOut
+    mkdir -p $out/bin
+    mkdir -p $out/share/viewmtn
     
     cp -r * $fullOut
     cp $fullOut/viewmtn.py $out/bin