Browse Source

Another attempt to eradicate ensureDir

See c556a6ea46.
nixos-19.03
Eelco Dolstra 8 years ago
parent
commit
40f7b0f9df
  1. 2
      nixos/doc/manual/default.nix
  2. 4
      nixos/lib/make-iso9660-image.sh
  3. 4
      nixos/lib/make-system-tarball.sh
  4. 2
      nixos/modules/services/amqp/activemq/default.nix
  5. 2
      nixos/modules/services/hardware/acpid.nix
  6. 2
      nixos/modules/services/monitoring/nagios.nix
  7. 2
      nixos/modules/services/monitoring/systemhealth.nix
  8. 2
      nixos/modules/services/network-filesystems/openafs-client/default.nix
  9. 4
      nixos/modules/services/networking/ircd-hybrid/builder.sh
  10. 2
      nixos/modules/services/system/dbus.nix
  11. 4
      nixos/modules/services/web-servers/apache-httpd/default.nix
  12. 4
      nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
  13. 2
      nixos/modules/services/web-servers/apache-httpd/mercurial.nix
  14. 2
      nixos/modules/services/x11/display-managers/lightdm.nix
  15. 2
      nixos/modules/services/x11/display-managers/slim.nix
  16. 2
      nixos/modules/system/boot/stage-1.nix
  17. 2
      nixos/modules/tasks/tty-backgrounds-combine.sh
  18. 2
      nixos/modules/virtualisation/qemu-vm.nix
  19. 2
      pkgs/applications/audio/espeak/edit.nix
  20. 2
      pkgs/applications/audio/mixxx/default.nix
  21. 2
      pkgs/applications/audio/praat/default.nix
  22. 4
      pkgs/applications/editors/atom/default.nix
  23. 6
      pkgs/applications/editors/dhex/default.nix
  24. 4
      pkgs/applications/editors/emacs-modes/calfw/default.nix
  25. 2
      pkgs/applications/editors/emacs-modes/ocaml/default.nix
  26. 2
      pkgs/applications/editors/emacs-modes/tuareg/default.nix
  27. 2
      pkgs/applications/editors/vim/macvim.nix
  28. 2
      pkgs/applications/graphics/alchemy/default.nix
  29. 4
      pkgs/applications/misc/keepass/default.nix
  30. 2
      pkgs/applications/misc/librecad/2.0.nix
  31. 2
      pkgs/applications/misc/librecad/default.nix
  32. 2
      pkgs/applications/misc/synergy/default.nix
  33. 2
      pkgs/applications/misc/vanitygen/default.nix
  34. 2
      pkgs/applications/networking/bittorrentsync/default.nix
  35. 2
      pkgs/applications/networking/browsers/chromium/browser.nix
  36. 2
      pkgs/applications/networking/browsers/chromium/default.nix
  37. 6
      pkgs/applications/networking/browsers/chromium/plugins.nix
  38. 2
      pkgs/applications/networking/browsers/chromium/source/default.nix
  39. 2
      pkgs/applications/networking/dropbox-cli/default.nix
  40. 6
      pkgs/applications/networking/dropbox/default.nix
  41. 2
      pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
  42. 2
      pkgs/applications/networking/irc/irssi/fish/default.nix
  43. 2
      pkgs/applications/networking/p2p/freenet/default.nix
  44. 2
      pkgs/applications/networking/syncthing/default.nix
  45. 4
      pkgs/applications/office/zotero/default.nix
  46. 2
      pkgs/applications/science/math/gap/default.nix
  47. 4
      pkgs/applications/version-management/git-and-tools/git-bz/default.nix
  48. 2
      pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
  49. 6
      pkgs/applications/video/makemkv/builder.sh
  50. 2
      pkgs/applications/video/omxplayer/default.nix
  51. 4
      pkgs/build-support/cabal/default.nix
  52. 2
      pkgs/build-support/kdewrapper/default.nix
  53. 2
      pkgs/build-support/make-startupitem/default.nix
  54. 2
      pkgs/build-support/release/functions.sh
  55. 2
      pkgs/build-support/vm/windows/bootstrap.nix
  56. 4
      pkgs/build-support/vm/windows/install/default.nix
  57. 2
      pkgs/data/misc/tzdata/default.nix
  58. 6
      pkgs/development/compilers/ghdl/default.nix
  59. 2
      pkgs/development/compilers/gwt/2.4.0.nix
  60. 2
      pkgs/development/compilers/mercury/default.nix
  61. 2
      pkgs/development/compilers/ocaml/3.11.2.nix
  62. 8
      pkgs/development/compilers/pakcs/default.nix
  63. 2
      pkgs/development/libraries/aacskeys/default.nix
  64. 2
      pkgs/development/libraries/apache-activemq/default.nix
  65. 2
      pkgs/development/libraries/bwidget/default.nix
  66. 2
      pkgs/development/libraries/haskell/ghc-heap-view/default.nix
  67. 2
      pkgs/development/libraries/haskell/ghc-mod/default.nix
  68. 2
      pkgs/development/libraries/haskell/ghc-vis/default.nix
  69. 2
      pkgs/development/libraries/haskell/hoogle/local.nix
  70. 2
      pkgs/development/mobile/androidenv/androidsdk.nix
  71. 2
      pkgs/development/mobile/xcodeenv/simulate-app.nix
  72. 2
      pkgs/development/mobile/xcodeenv/xcodewrapper.nix
  73. 2
      pkgs/development/ocaml-modules/ocamlmake/default.nix
  74. 2
      pkgs/development/tools/apktool/default.nix
  75. 2
      pkgs/development/tools/literate-programming/noweb/default.nix
  76. 2
      pkgs/development/tools/misc/distcc/masq.nix
  77. 2
      pkgs/development/tools/misc/grafana/default.nix
  78. 2
      pkgs/development/tools/misc/opengrok/default.nix
  79. 4
      pkgs/development/tools/node-webkit/default.nix
  80. 2
      pkgs/development/tools/ocaml/deriving/default.nix
  81. 2
      pkgs/development/tools/yuicompressor/default.nix
  82. 2
      pkgs/games/andyetitmoves/default.nix
  83. 6
      pkgs/games/crafty/default.nix
  84. 4
      pkgs/games/gsb/default.nix
  85. 2
      pkgs/games/openlierox/default.nix
  86. 4
      pkgs/games/opentyrian/default.nix
  87. 4
      pkgs/games/vessel/default.nix
  88. 4
      pkgs/games/worldofgoo/default.nix
  89. 2
      pkgs/misc/emulators/bsod/default.nix
  90. 2
      pkgs/misc/vim-plugins/default.nix
  91. 4
      pkgs/os-specific/darwin/xcode/default.nix
  92. 2
      pkgs/os-specific/linux/apparmor/default.nix
  93. 4
      pkgs/os-specific/linux/bbswitch/default.nix
  94. 4
      pkgs/os-specific/linux/frandom/default.nix
  95. 2
      pkgs/os-specific/linux/gogoclient/default.nix
  96. 2
      pkgs/os-specific/linux/google-authenticator/default.nix
  97. 2
      pkgs/os-specific/linux/i7z/default.nix
  98. 2
      pkgs/os-specific/linux/mcelog/default.nix
  99. 2
      pkgs/os-specific/linux/microcode/converter.nix
  100. 4
      pkgs/os-specific/linux/netatop/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

2
nixos/doc/manual/default.nix

@ -67,7 +67,7 @@ in rec {
# Generate the HTML manual.
dst=$out/share/doc/nixos
ensureDir $dst
mkdir -p $dst
xsltproc $xsltFlags --nonet --xinclude \
--output $dst/manual.html \
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \

4
nixos/lib/make-iso9660-image.sh

@ -78,7 +78,7 @@ done
cat pathlist | sed -e 's/=\(.*\)=\(.*\)=/\\=\1=\2\\=/' | tee pathlist.safer
ensureDir $out/iso
mkdir -p $out/iso
genCommand="genisoimage -iso-level 4 -r -J $bootFlags -hide-rr-moved -graft-points -path-list pathlist.safer ${volumeID:+-V $volumeID}"
if test -z "$compressImage"; then
$genCommand -o $out/iso/$isoName
@ -87,5 +87,5 @@ else
fi
ensureDir $out/nix-support
mkdir -p $out/nix-support
echo $system > $out/nix-support/system

4
nixos/lib/make-system-tarball.sh

@ -48,11 +48,11 @@ for ((n = 0; n < ${#objects[*]}; n++)); do
fi
done
ensureDir $out/tarball
mkdir -p $out/tarball
tar cvJf $out/tarball/$fileName.tar.xz *
ensureDir $out/nix-support
mkdir -p $out/nix-support
echo $system > $out/nix-support/system
echo "file system-tarball $out/tarball/$fileName.tar.xz" > $out/nix-support/hydra-build-products

2
nixos/modules/services/amqp/activemq/default.nix

@ -12,7 +12,7 @@ let
phases = [ "installPhase" ];
buildInputs = [ jdk ];
installPhase = ''
ensureDir $out/lib
mkdir -p $out/lib
source ${activemq}/lib/classpath.env
export CLASSPATH
ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java

2
nixos/modules/services/hardware/acpid.nix

@ -6,7 +6,7 @@ let
acpiConfDir = pkgs.runCommand "acpi-events" {}
''
ensureDir $out
mkdir -p $out
${
# Generate a configuration file for each event. (You can't have
# multiple events in one config file...)

2
nixos/modules/services/monitoring/nagios.nix

@ -12,7 +12,7 @@ let
nagiosObjectDefs = cfg.objectDefs;
nagiosObjectDefsDir = pkgs.runCommand "nagios-objects" {inherit nagiosObjectDefs;}
"ensureDir $out; ln -s $nagiosObjectDefs $out/";
"mkdir -p $out; ln -s $nagiosObjectDefs $out/";
nagiosCfgFile = pkgs.writeText "nagios.cfg"
''

2
nixos/modules/services/monitoring/systemhealth.nix

@ -13,7 +13,7 @@ let
};
buildInputs = [ python ];
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
# Make it work for kernels 3.x, not so different than 2.6
sed -i 's/2\.6/4.0/' system_health.py
cp system_health.py $out/bin

2
nixos/modules/services/network-filesystems/openafs-client/default.nix

@ -11,7 +11,7 @@ let
};
afsConfig = pkgs.runCommand "afsconfig" {} ''
ensureDir $out
mkdir -p $out
echo ${cfg.cellName} > $out/ThisCell
cp ${cellServDB} $out/CellServDB
echo "/afs:${cfg.cacheDirectory}:${cfg.cacheSize}" > $out/cacheinfo

4
nixos/modules/services/networking/ircd-hybrid/builder.sh

@ -3,7 +3,7 @@ source $stdenv/setup
doSub() {
local src=$1
local dst=$2
ensureDir $(dirname $dst)
mkdir -p $(dirname $dst)
substituteAll $src $dst
}
@ -28,4 +28,4 @@ for i in $substFiles; do
fi
done
ensureDir $out/bin
mkdir -p $out/bin

2
nixos/modules/services/system/dbus.nix

@ -14,7 +14,7 @@ let
name = "dbus-conf";
preferLocalBuild = true;
buildCommand = ''
ensureDir $out
mkdir -p $out
cp -v ${pkgs.dbus.daemon}/etc/dbus-1/system.conf $out/system.conf

4
nixos/modules/services/web-servers/apache-httpd/default.nix

@ -80,7 +80,7 @@ let
# !!! should be in lib
writeTextInDir = name: text:
pkgs.runCommand name {inherit text;} "ensureDir $out; echo -n \"$text\" > $out/$name";
pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name";
enableSSL = any (vhost: vhost.enableSSL) allHosts;
@ -194,7 +194,7 @@ let
) null ([ cfg ] ++ subservices);
documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
pkgs.runCommand "empty" {} "ensureDir $out";
pkgs.runCommand "empty" {} "mkdir -p $out";
documentRootConf = ''
DocumentRoot "${documentRoot}"

4
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix

@ -90,7 +90,7 @@ let
installPhase =
''
ensureDir $out
mkdir -p $out
cp -r * $out
cp ${mediawikiConfig} $out/LocalSettings.php
sed -i 's|/bin/bash|${pkgs.stdenv.shell}|' \
@ -103,7 +103,7 @@ let
mediawikiScripts = pkgs.runCommand "mediawiki-${config.id}-scripts"
{ buildInputs = [ pkgs.makeWrapper ]; }
''
ensureDir $out/bin
mkdir -p $out/bin
for i in changePassword.php createAndPromote.php userOptions.php edit.php nukePage.php update.php; do
makeWrapper ${php}/bin/php $out/bin/mediawiki-${config.id}-$(basename $i .php) \
--add-flags ${mediawikiRoot}/maintenance/$i

2
nixos/modules/services/web-servers/apache-httpd/mercurial.nix

@ -9,7 +9,7 @@ let
cgi = pkgs.stdenv.mkDerivation {
name = "mercurial-cgi";
buildCommand = ''
ensureDir $out
mkdir -p $out
cp -v ${mercurial}/share/cgi-bin/hgweb.cgi $out
sed -i "s|/path/to/repo/or/config|$out/hgweb.config|" $out/hgweb.cgi
echo "

2
nixos/modules/services/x11/display-managers/lightdm.nix

@ -26,7 +26,7 @@ let
buildInputs = [ pkgs.makeWrapper ];
buildCommand = ''
ensureDir $out/gtk-3.0/
mkdir -p $out/gtk-3.0/
# This wrapper ensures that we actually get fonts
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \

2
nixos/modules/services/x11/display-managers/slim.nix

@ -27,7 +27,7 @@ let
unpackedTheme = pkgs.stdenv.mkDerivation {
name = "slim-theme";
buildCommand = ''
ensureDir $out
mkdir -p $out
cd $out
unpackFile ${cfg.theme}
ln -s * default

2
nixos/modules/system/boot/stage-1.nix

@ -140,7 +140,7 @@ let
udevRules = pkgs.stdenv.mkDerivation {
name = "udev-rules";
buildCommand = ''
ensureDir $out
mkdir -p $out
echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules

2
nixos/modules/tasks/tty-backgrounds-combine.sh

@ -3,7 +3,7 @@ source $stdenv/setup
ttys=($ttys)
themes=($themes)
ensureDir $out
mkdir -p $out
defaultName=$(cd $default && ls | grep -v default)
echo $defaultName

2
nixos/modules/virtualisation/qemu-vm.nix

@ -379,7 +379,7 @@ in
system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
''
ensureDir $out/bin
mkdir -p $out/bin
ln -s ${config.system.build.toplevel} $out/system
ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${vmName}-vm
'';

2
pkgs/applications/audio/espeak/edit.nix

@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp espeakedit $out/bin
'';

2
pkgs/applications/audio/mixxx/default.nix

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
ensureDir "$out"
mkdir -p "$out"
scons \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
$sconsFlags "prefix=$out"

2
pkgs/applications/audio/praat/default.nix

@ -13,7 +13,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp praat $out/bin
'';

4
pkgs/applications/editors/atom/default.nix

@ -43,8 +43,8 @@ in stdenv.mkDerivation rec {
phases = [ "installPhase" ];
installPhase = ''
ensureDir $out/share/atom
ensureDir $out/bin
mkdir -p $out/share/atom
mkdir -p $out/bin
tar -C $out/share/atom -xvf $src
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/atom

6
pkgs/applications/editors/dhex/default.nix

@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
installPhase = ''
ensureDir $out/bin
ensureDir $out/share/man/man1
ensureDir $out/share/man/man5
mkdir -p $out/bin
mkdir -p $out/share/man/man1
mkdir -p $out/share/man/man5
cp dhex $out/bin
cp dhex.1 $out/share/man/man1

4
pkgs/applications/editors/emacs-modes/calfw/default.nix

@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
installPhase =
''
ensureDir "$out/share/doc/${name}"
mkdir -p "$out/share/doc/${name}"
cp -v readme.md "$out/share/doc/${name}"
ensureDir "$out/share/emacs/site-lisp/"
mkdir -p "$out/share/emacs/site-lisp/"
cp *.el "$out/share/emacs/site-lisp/"
'';

2
pkgs/applications/editors/emacs-modes/ocaml/default.nix

@ -18,7 +18,7 @@ in stdenv.mkDerivation {
installPhase = ''
cd emacs;
ensureDir "$out/share/emacs/site-lisp" "$out/bin"
mkdir -p "$out/share/emacs/site-lisp" "$out/bin"
EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags
'';

2
pkgs/applications/editors/emacs-modes/tuareg/default.nix

@ -15,7 +15,7 @@ in stdenv.mkDerivation {
buildInputs = [ emacs ];
installPhase = ''
ensureDir "$out/share/emacs/site-lisp"
mkdir -p "$out/share/emacs/site-lisp"
cp *.el *.elc "$out/share/emacs/site-lisp"
'';

2
pkgs/applications/editors/vim/macvim.nix

@ -62,7 +62,7 @@ in mkDerivation rec {
'';
postInstall = ''
ensureDir $out/Applications
mkdir -p $out/Applications
cp -r src/MacVim/build/Release/MacVim.app $out/Applications
rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view}

2
pkgs/applications/graphics/alchemy/default.nix

@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
installPhase = ''
ensureDir $out/bin $out/share
mkdir -p $out/bin $out/share
cp -a . $out/share/alchemy
cat >> $out/bin/alchemy << EOF
#!/bin/sh

4
pkgs/applications/misc/keepass/default.nix

@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
installPhase = ''
ensureDir "$out/bin"
mkdir -p "$out/bin"
echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass
chmod +x $out/bin/keepass
echo $out
cp -r ./* $out/
ensureDir "$out/share/applications"
mkdir -p "$out/share/applications"
cp ${desktopItem}/share/applications/* $out/share/applications
'';

2
pkgs/applications/misc/librecad/2.0.nix

@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/bin $out/share
mkdir -p $out/bin $out/share
cp -R unix/librecad $out/bin
cp -R unix/resources $out/share/librecad
'';

2
pkgs/applications/misc/librecad/default.nix

@ -17,7 +17,7 @@ stdenv.mkDerivation {
configurePhase = "qmake PREFIX=$out";
installPhase = ''
ensureDir $out/bin $out/share
mkdir -p $out/bin $out/share
cp -R unix/librecad $out/bin
cp -R unix/resources $out/share/librecad
'';

2
pkgs/applications/misc/synergy/default.nix

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# http://synergy-foss.org/spit/issues/details/3317/
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp ../bin/synergyc $out/bin
cp ../bin/synergys $out/bin
cp ../bin/synergyd $out/bin

2
pkgs/applications/misc/vanitygen/default.nix

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl pcre ];
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp vanitygen $out/bin
cp keyconv $out/bin/vanitygen-keyconv
'';

2
pkgs/applications/networking/bittorrentsync/default.nix

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ patchelf ];
installPhase = ''
ensureDir "$out/bin/"
mkdir -p "$out/bin/"
cp -r "btsync" "$out/bin/"
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \

2
pkgs/applications/networking/browsers/chromium/browser.nix

@ -8,7 +8,7 @@ mkChromiumDerivation (base: rec {
buildTargets = [ "mksnapshot" "chrome" ];
installPhase = ''
ensureDir "$libExecPath"
mkdir -p "$libExecPath"
cp -v "$buildPath/"*.pak "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"

2
pkgs/applications/networking/browsers/chromium/default.nix

@ -67,7 +67,7 @@ in stdenv.mkDerivation {
browserBinary = "${chromium.browser}/libexec/chromium/chromium";
sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
in ''
ensureDir "$out/bin" "$out/share/applications"
mkdir -p "$out/bin" "$out/share/applications"
ln -s "${chromium.browser}/share" "$out/share"
makeWrapper "${browserBinary}" "$out/bin/chromium" \

6
pkgs/applications/networking/browsers/chromium/plugins.nix

@ -22,7 +22,7 @@ let
else if source.channel == "stable" then "chrome"
else "chrome-${source.channel}";
in ''
ensureDir plugins
mkdir -p plugins
ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
./opt/google/${chan}/PepperFlash \
./opt/google/${chan}/libpdf.so
@ -53,7 +53,7 @@ let
pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
in ''
install -vD libpdf.so "$pdf/lib/libpdf.so"
ensureDir "$pdf/nix-support"
mkdir -p "$pdf/nix-support"
echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
> "$pdf/nix-support/chromium-flags"
@ -63,7 +63,7 @@ let
install -vD PepperFlash/libpepflashplayer.so \
"$flash/lib/libpepflashplayer.so"
ensureDir "$flash/nix-support"
mkdir -p "$flash/nix-support"
echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
"--ppapi-flash-version=$flashVersion" \
> "$flash/nix-support/chromium-flags"

2
pkgs/applications/networking/browsers/chromium/source/default.nix

@ -44,7 +44,7 @@ stdenv.mkDerivation {
outputs = [ "out" "sandbox" "bundled" "main" ];
installPhase = ''
ensureDir "$out" "$sandbox" "$bundled" "$main"
mkdir -p "$out" "$sandbox" "$bundled" "$main"
header "copying browser main sources to $main"
find . -mindepth 1 -maxdepth 1 \

2
pkgs/applications/networking/dropbox-cli/default.nix

@ -15,7 +15,7 @@ stdenv.mkDerivation {
phases = "unpackPhase installPhase";
installPhase = ''
ensureDir "$out/bin/" "$out/share/applications"
mkdir -p "$out/bin/" "$out/share/applications"
cp data/dropbox.desktop "$out/share/applications"
substitute "dropbox.in" "$out/bin/dropbox" \
--replace '@PACKAGE_VERSION@' ${version} \

6
pkgs/applications/networking/dropbox/default.nix

@ -70,9 +70,9 @@ in stdenv.mkDerivation {
'';
installPhase = ''
ensureDir "$out/${appdir}"
mkdir -p "$out/${appdir}"
cp -r ".dropbox-dist/"* "$out/${appdir}/"
ensureDir "$out/bin"
mkdir -p "$out/bin"
ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
@ -83,7 +83,7 @@ in stdenv.mkDerivation {
find "$out/${appdir}" -type f -a -perm +0100 \
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
ensureDir "$out/share/applications"
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications
'';

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildPhase = "make libskype.so libskype_dbus.so";
installPhase = ''
ensureDir $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48} $out/bin $out/lib/pidgin
cp icons/16/skypeout.png $out/pixmaps/pidgin/protocols/16
cp icons/22/skypeout.png $out/pixmaps/pidgin/protocols/22
cp icons/48/skypeout.png $out/pixmaps/pidgin/protocols/48

2
pkgs/applications/networking/irc/irssi/fish/default.nix

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/lib/irssi/modules
mkdir -p $out/lib/irssi/modules
cp src/.libs/libfish.so $out/lib/irssi/modules
'';

2
pkgs/applications/networking/p2p/freenet/default.nix

@ -34,7 +34,7 @@ stdenv.mkDerivation {
buildPhase = "ant package-only";
installPhase = ''
ensureDir $out/share/freenet $out/bin
mkdir -p $out/share/freenet $out/bin
cp lib/bcprov.jar $out/share/freenet
cp lib/freenet/freenet-ext.jar $out/share/freenet
cp dist/freenet.jar $out/share/freenet

2
pkgs/applications/networking/syncthing/default.nix

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp -r ./bin $out
'';

4
pkgs/applications/office/zotero/default.nix

@ -23,10 +23,10 @@ stdenv.mkDerivation {
inherit bash xulrunner;
installPhase = ''
ensureDir "$out/libexec/zotero"
mkdir -p "$out/libexec/zotero"
cp -vR * "$out/libexec/zotero/"
ensureDir "$out/bin"
mkdir -p "$out/bin"
substituteAll "${./zotero.sh}" "$out/bin/zotero"
chmod +x "$out/bin/zotero"
'';

2
pkgs/applications/science/math/gap/default.nix

@ -38,7 +38,7 @@ rec {
phaseNames = ["doConfigure" "doMake" "doDeploy"];
doDeploy = a.fullDepEntry ''
ensureDir "$out/bin" "$out/share/gap/"
mkdir -p "$out/bin" "$out/share/gap/"
cp -r . "$out/share/gap/build-dir"

4
pkgs/applications/version-management/git-and-tools/git-bz/default.nix

@ -21,8 +21,8 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out
ensureDir $out/bin
mkdir -p $out
mkdir -p $out/bin
cp git-bz $out/bin
wrapProgram $out/bin/git-bz \
--prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"

2
pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp svn-all-fast-export $out/bin
'';

6
pkgs/applications/video/makemkv/builder.sh

@ -30,9 +30,9 @@ for i in ${bin} ; do
${i}
done
ensureDir $out/bin
ensureDir $out/lib
ensureDir $out/share/MakeMKV
mkdir -p $out/bin
mkdir -p $out/lib
mkdir -p $out/share/MakeMKV
cp ${lib} ${out}/lib
cp ${bin} ${out}/bin
cp makemkv-bin-${ver}/src/share/* $out/share/MakeMKV

2
pkgs/applications/video/omxplayer/default.nix

@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
export INCLUDES="-I${raspberrypifw}/include/interface/vcos/pthreads -I${raspberrypifw}/include/interface/vmcs_host/linux/"
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp omxplayer.bin $out/bin
'';
buildInputs = [ raspberrypifw ffmpeg pcre boostHeaders freetype zlib ];

4
pkgs/build-support/cabal/default.nix

@ -250,12 +250,12 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
./Setup copy
ensureDir $out/bin # necessary to get it added to PATH
mkdir -p $out/bin # necessary to get it added to PATH
local confDir=$out/lib/ghc-${ghc.ghc.version}/package.conf.d
local installedPkgConf=$confDir/${self.fname}.installedconf
local pkgConf=$confDir/${self.fname}.conf
ensureDir $confDir
mkdir -p $confDir
./Setup register --gen-pkg-config=$pkgConf
if test -f $pkgConf; then
echo '[]' > $installedPkgConf

2
pkgs/build-support/kdewrapper/default.nix

@ -20,7 +20,7 @@ stdenv.mkDerivation {
inherit libs;
buildCommand = ''
ensureDir $out/bin
mkdir -p $out/bin
KDEDIRS=${program}
QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins

2
pkgs/build-support/make-startupitem/default.nix

@ -19,7 +19,7 @@ stdenv.mkDerivation {
priority = 5;
buildCommand = ''
ensureDir $out/share/autostart
mkdir -p $out/share/autostart
target=${name}.desktop
cp ${package}/share/applications/${srcPrefix}${name}.desktop $target
chmod +rw $target

2
pkgs/build-support/release/functions.sh

@ -9,6 +9,6 @@ findTarballs() {
}
propagateImageName() {
ensureDir $out/nix-support
mkdir -p $out/nix-support
cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name
}

2
pkgs/build-support/vm/windows/bootstrap.nix

@ -69,7 +69,7 @@ in rec {
-b "${installedVM}/disk.img" \
-f qcow2 winvm.img
${runAndSuspend}
ensureDir "$out"
mkdir -p "$out"
cp winvm.img "$out/disk.img"
cp state.gz "$out/state.gz"
'';

4
pkgs/build-support/vm/windows/install/default.nix

@ -22,7 +22,7 @@ let
cygwinSshKey = stdenv.mkDerivation {
name = "snakeoil-ssh-cygwin";
buildCommand = ''
ensureDir "$out"
mkdir -p "$out"
${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N ""
'';
};
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
buildCommand = ''
${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G
${installController}
ensureDir "$out"
mkdir -p "$out"
cp winvm.img "$out/disk.img"
'';
passthru = {

2
pkgs/data/misc/tzdata/default.nix

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
ln -s . $out/share/zoneinfo/posix
mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
ensureDir "$lib/include"
mkdir -p "$lib/include"
cp tzfile.h "$lib/include/tzfile.h"
'';

6
pkgs/development/compilers/ghdl/default.nix

@ -34,14 +34,14 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp ghdl_mcode $out/bin
ensureDir $out/share/ghdl_mcode/translate
mkdir -p $out/share/ghdl_mcode/translate
cp -R ../lib $out/share/ghdl_mcode/translate
cp -R ../../libraries $out/share/ghdl_mcode
ensureDir $out/share/man/man1
mkdir -p $out/share/man/man1
cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1
# Ghdl has some timestamps checks, storing file timestamps in '.cf' files.

2
pkgs/development/compilers/gwt/2.4.0.nix

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ unzip ];
installPhase = ''
ensureDir $out
mkdir -p $out
unzip $src
mv gwt-2.4.0 $out/bin
'';

2
pkgs/development/compilers/mercury/default.nix

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = ''
ensureDir $out/lib/mercury/cgi-bin ;
mkdir -p $out/lib/mercury/cgi-bin ;
configureFlags="--enable-deep-profiler=$out/lib/mercury/cgi-bin";
'';

2
pkgs/development/compilers/ocaml/3.11.2.nix

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
patch -p0 < ${./mips64.patch}
'';
postBuild = ''
ensureDir $out/include
mkdir -p $out/include
ln -sv $out/lib/ocaml/caml $out/include/caml
'';

8
pkgs/development/compilers/pakcs/default.nix

@ -54,13 +54,13 @@ stdenv.mkDerivation rec {
export LC_ALL=en_US.UTF-8
# Set up link to cymake, which has been built already.
ensureDir bin/.local
mkdir -p bin/.local
ln -s ${curryFront}/bin/cymake bin/.local/
'';
installPhase = ''
# Prepare PAKCSHOME directory.
ensureDir $out/pakcs
mkdir -p $out/pakcs
for d in bin curry2prolog currytools lib tools cpns include www examples docs ; do
cp -r $d $out/pakcs ;
done
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
(cd $out/pakcs/www ; make)
# Install bin.
ensureDir $out/bin
mkdir -p $out/bin
for b in makecurrycgi .makesavedstate pakcs parsecurry cleancurry \
addtypes cass currybrowse currycreatemake currydoc currytest \
dataToXml erd2curry ; do
@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
done
# Place emacs lisp files in expected locations.
ensureDir $out/share/emacs/site-lisp/curry-pakcs
mkdir -p $out/share/emacs/site-lisp/curry-pakcs
for e in "tools/emacs/"*.el ; do
cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
done

2
pkgs/development/libraries/aacskeys/default.nix

@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [openssl jdk premake3];
installPhase = ''
ensureDir $out/{bin,lib,share/${baseName}}
mkdir -p $out/{bin,lib,share/${baseName}}
# Install lib
install -Dm444 lib/linux/libaacskeys.so $out/lib

2
pkgs/development/libraries/apache-activemq/default.nix

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
ensureDir $out
mkdir -p $out
mv * $out/
for j in `find $out/lib -name "*.jar"`; do
cp="''${cp:+"$cp:"}$j";

2
pkgs/development/libraries/bwidget/default.nix

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
ensureDir "$out/lib/${passthru.libPrefix}"
mkdir -p "$out/lib/${passthru.libPrefix}"
cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}"
'';

2
pkgs/development/libraries/haskell/ghc-heap-view/default.nix

@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
buildDepends = [ binary transformers ];
postInstall = ''
ensureDir "$out/share/ghci"
mkdir -p "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {

2
pkgs/development/libraries/haskell/ghc-mod/default.nix

@ -24,7 +24,7 @@ cabal.mkDerivation (self: {
make
rm Makefile
cd ..
ensureDir "$out/share/emacs"
mkdir -p "$out/share/emacs"
mv $pname-$version emacs/site-lisp
mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped

2
pkgs/development/libraries/haskell/ghc-vis/default.nix

@ -12,7 +12,7 @@ cabal.mkDerivation (self: {
];
jailbreak = true;
postInstall = ''
ensureDir "$out/share/ghci"
mkdir -p "$out/share/ghci"
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
'';
meta = {

2
pkgs/development/libraries/haskell/hoogle/local.nix

@ -65,7 +65,7 @@ cabal.mkDerivation (self: rec {
exit 1
fi
ensureDir $out/share/hoogle/doc
mkdir -p $out/share/hoogle/doc
export HOOGLE_DOC_PATH=$out/share/hoogle/doc
cd $out/share/hoogle

2
pkgs/development/mobile/androidenv/androidsdk.nix vendored

@ -178,7 +178,7 @@ stdenv.mkDerivation rec {
# Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH
ensureDir $out/bin
mkdir -p $out/bin
for i in $out/libexec/android-sdk-*/tools/*
do

2
pkgs/development/mobile/xcodeenv/simulate-app.nix vendored

@ -10,7 +10,7 @@ in
stdenv.mkDerivation {
name = stdenv.lib.replaceChars [" "] [""] name;
buildCommand = ''
ensureDir $out/bin
mkdir -p $out/bin
cat > $out/bin/run-test-simulator << "EOF"
#! ${stdenv.shell} -e

2
pkgs/development/mobile/xcodeenv/xcodewrapper.nix vendored

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "xcode-wrapper-"+version;
buildCommand = ''
ensureDir $out/bin
mkdir -p $out/bin
cd $out/bin
ln -s /usr/bin/xcode-select
ln -s /usr/bin/xcodebuild

2
pkgs/development/ocaml-modules/ocamlmake/default.nix

@ -14,7 +14,7 @@ in stdenv.mkDerivation {
};
installPhase = ''
ensureDir "$out/include/"
mkdir -p "$out/include/"
cp OCamlMakefile "$out/include/"
'';

2
pkgs/development/tools/apktool/default.nix

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D apktool.jar "$out/libexec/apktool/apktool.jar"
ensureDir "$out/bin"
mkdir -p "$out/bin"
makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
--add-flags "-jar $out/libexec/apktool/apktool.jar" \
--prefix PATH : "${buildTools}/build-tools/android-4.3/"

2
pkgs/development/tools/literate-programming/noweb/default.nix

@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9";
};
preBuild = ''