From c556a6ea46e71e1907d78b71fab36df30297b3ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra 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/audio/ardour/default.nix | 2 +- pkgs/applications/audio/gmu/default.nix | 2 +- pkgs/applications/audio/id3v2/default.nix | 2 +- pkgs/applications/audio/ladspa-plugins/default.nix | 2 +- pkgs/applications/audio/ladspa-plugins/ladspah.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 4 ++-- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/snd/default.nix | 2 +- .../audio/sonic-visualiser/default.nix | 2 +- pkgs/applications/audio/vkeybd/default.nix | 2 +- pkgs/applications/audio/xsynth-dssi/default.nix | 4 ++-- pkgs/applications/editors/eclipse/default.nix | 4 ++-- pkgs/applications/editors/elvis/default.nix | 6 ++--- .../editors/emacs-modes/bbdb/default.nix | 2 +- .../editors/emacs-modes/cedet/default.nix | 4 ++-- .../editors/emacs-modes/ecb/default.nix | 4 ++-- .../editors/emacs-modes/emms/default.nix | 4 ++-- .../editors/emacs-modes/haskell/default.nix | 2 +- .../editors/emacs-modes/hol_light/default.nix | 2 +- .../editors/emacs-modes/jdee/default.nix | 4 ++-- .../editors/emacs-modes/org/default.nix | 4 ++-- .../editors/emacs-modes/quack/default.nix | 2 +- .../editors/emacs-modes/rudel/default.nix | 2 +- .../editors/emacs-modes/scala-mode/default.nix | 2 +- .../session-management-for-emacs/default.nix | 2 +- pkgs/applications/editors/jedit/default.nix | 14 ++++++------ pkgs/applications/editors/jedit/wrapper.nix | 2 +- pkgs/applications/editors/nedit/builder.sh | 2 +- pkgs/applications/editors/nvi/default.nix | 4 ++-- .../applications/graphics/gimp/plugins/default.nix | 10 ++++----- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- pkgs/applications/graphics/meshlab/default.nix | 2 +- pkgs/applications/graphics/minidjvu/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- pkgs/applications/graphics/rawtherapee/default.nix | 2 +- pkgs/applications/graphics/wings/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 2 +- pkgs/applications/misc/adobe-reader/builder.sh | 4 ++-- .../applications/misc/audio/wavesurfer/default.nix | 2 +- pkgs/applications/misc/bitcoin/default.nix | 2 +- pkgs/applications/misc/blender/2.49.nix | 2 +- pkgs/applications/misc/freemind/default.nix | 2 +- pkgs/applications/misc/get_iplayer/default.nix | 2 +- pkgs/applications/misc/googleearth/default.nix | 2 +- pkgs/applications/misc/jbidwatcher/default.nix | 2 +- pkgs/applications/misc/makeself/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- pkgs/applications/misc/openjump/default.nix | 2 +- pkgs/applications/misc/procmail/default.nix | 2 +- pkgs/applications/misc/pstree/default.nix | 2 +- pkgs/applications/misc/qcad/default.nix | 2 +- pkgs/applications/misc/rxvt_unicode/default.nix | 2 +- pkgs/applications/misc/sbagen/default.nix | 2 +- pkgs/applications/misc/thinking-rock/default.nix | 2 +- pkgs/applications/misc/vue/default.nix | 2 +- pkgs/applications/misc/xpdf/libxpdf.nix | 8 +++---- .../networking/browsers/chromium/default.nix | 4 ++-- .../networking/browsers/firefox/wrapper.nix | 2 +- .../networking/browsers/icecat-3/default.nix | 2 +- .../mozilla-plugins/flashplayer-10/builder.sh | 2 +- .../mozilla-plugins/flashplayer-11/builder.sh | 2 +- .../mozilla-plugins/flashplayer-9/builder.sh | 2 +- .../mozilla-plugins/mozplugger/default.nix | 2 +- .../mozilla-plugins/mplayerplug-in/default.nix | 2 +- .../instant-messengers/carrier/2.4.2.nix | 2 +- .../instant-messengers/carrier/2.5.0.nix | 2 +- .../instant-messengers/oneteam/default.nix | 6 ++--- .../pidgin-plugins/msn-pecan/default.nix | 2 +- .../pidgin-latex/pidgin-latex-sf.nix | 6 ++--- .../networking/instant-messengers/psi/default.nix | 4 ++-- .../networking/instant-messengers/psi/psimedia.nix | 2 +- .../instant-messengers/torchat/default.nix | 2 +- pkgs/applications/networking/iptraf/default.nix | 2 +- .../networking/mailreaders/thunderbird/9.x.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/applications/networking/offrss/default.nix | 2 +- pkgs/applications/networking/p2p/ldcpp/default.nix | 2 +- .../networking/p2p/mldonkey/default.nix | 2 +- pkgs/applications/networking/pjsip/default.nix | 4 ++-- pkgs/applications/networking/skype/default.nix | 4 ++-- .../networking/sync/unison/default.nix | 2 +- pkgs/applications/networking/vnstat/default.nix | 2 +- pkgs/applications/office/impressive/default.nix | 2 +- pkgs/applications/office/mmex/default.nix | 2 +- pkgs/applications/office/openoffice/builder.sh | 4 ++-- pkgs/applications/office/openoffice/get-go-src.nix | 2 +- pkgs/applications/office/openoffice/go-oo.nix | 2 +- pkgs/applications/science/biology/arb/default.nix | 8 +++---- .../science/biology/pal2nal/default.nix | 4 ++-- pkgs/applications/science/biology/slr/default.nix | 2 +- .../science/geometry/tetgen/default.nix | 2 +- pkgs/applications/science/logic/hol/default.nix | 4 ++-- .../science/logic/hol_light/default.nix | 2 +- .../applications/science/logic/iprover/default.nix | 4 ++-- .../science/logic/isabelle/default.nix | 2 +- pkgs/applications/science/logic/leo2/default.nix | 6 ++--- pkgs/applications/science/logic/matita/default.nix | 2 +- .../applications/science/logic/minisat/default.nix | 2 +- .../applications/science/logic/picosat/default.nix | 6 ++--- .../applications/science/logic/prover9/default.nix | 2 +- .../science/logic/satallax/default.nix | 6 ++--- .../science/logic/ssreflect/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 4 ++-- pkgs/applications/science/math/content/default.nix | 2 +- .../science/math/eukleides/default.nix | 2 +- pkgs/applications/science/math/maxima/default.nix | 2 +- pkgs/applications/science/math/msieve/default.nix | 2 +- .../applications/science/math/singular/default.nix | 2 +- pkgs/applications/taxes/aangifte-2005/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2006/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2007/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2008/builder.sh | 2 +- pkgs/applications/taxes/aangifte-2009/default.nix | 2 +- pkgs/applications/taxes/aangifte-2010/default.nix | 2 +- .../version-management/fossil/default.nix | 2 +- .../git-and-tools/fast-export/default.nix | 2 +- .../git-and-tools/git/default.nix | 6 ++--- .../git-and-tools/git/git-git.nix | 4 ++-- .../git-and-tools/stgit/default.nix | 2 +- .../git-and-tools/topgit/default.nix | 4 ++-- .../version-management/mercurial/default.nix | 4 ++-- .../version-management/monotone/default.nix | 4 ++-- .../version-management/veracity/default.nix | 10 ++++----- .../version-management/viewmtn/0.10.nix | 6 ++--- pkgs/applications/video/RealPlayer/builder.sh | 4 ++-- pkgs/applications/video/dvswitch/default.nix | 2 +- pkgs/applications/video/gnash/default.nix | 2 +- pkgs/applications/video/lxdvdrip/default.nix | 2 +- pkgs/applications/video/mythtv/builder.sh | 2 +- .../virtualization/qemu/linux-img/default.nix | 2 +- .../virtualization/virtualbox/default.nix | 6 ++--- .../virtualbox/guest-additions/default.nix | 16 ++++++------- .../window-managers/stumpwm/default.nix | 8 +++---- pkgs/applications/window-managers/vwm/default.nix | 2 +- .../window-managers/wmii31/default.nix | 2 +- pkgs/build-support/builder-defs/builder-defs.nix | 26 +++++++++++----------- pkgs/build-support/clang-wrapper/builder.sh | 4 ++-- pkgs/build-support/dotnetenv/build-solution.nix | 4 ++-- pkgs/build-support/fetchcvs/builder.sh | 2 +- pkgs/build-support/gcc-cross-wrapper/default.nix | 2 +- pkgs/build-support/gcc-upc-wrapper/builder.sh | 4 ++-- pkgs/build-support/gcc-wrapper/builder.sh | 4 ++-- pkgs/build-support/kernel/make-initrd.sh | 2 +- pkgs/build-support/kernel/modules-closure.sh | 2 +- pkgs/build-support/make-desktopitem/default.nix | 2 +- pkgs/build-support/make-wrapper/make-wrapper.sh | 2 +- .../native-darwin-cctools-wrapper/builder.sh | 2 +- pkgs/build-support/nuke-references/builder.sh | 2 +- pkgs/build-support/release/ant-build.nix | 6 ++--- pkgs/build-support/release/binary-tarball.nix | 4 ++-- pkgs/build-support/release/debian-build.nix | 4 ++-- pkgs/build-support/release/maven-build.nix | 4 ++-- pkgs/build-support/release/nix-build.nix | 4 ++-- pkgs/build-support/release/rpm-build.nix | 2 +- pkgs/build-support/release/source-tarball.nix | 4 ++-- pkgs/build-support/substitute/substitute-all.sh | 2 +- pkgs/build-support/trivial-builders.nix | 2 +- .../upstream-updater/attrset-to-dir.nix | 2 +- pkgs/build-support/vm/default.nix | 14 ++++++------ pkgs/build-support/vsenv/build-solution.nix | 2 +- .../documentation/pthread-man-pages/default.nix | 2 +- pkgs/data/documentation/rnrs/builder.sh | 4 ++-- pkgs/data/documentation/std-man-pages/default.nix | 2 +- pkgs/data/fonts/andagii/default.nix | 2 +- pkgs/data/fonts/bakoma-ttf/default.nix | 2 +- pkgs/data/fonts/clearlyU/default.nix | 2 +- pkgs/data/fonts/corefonts/default.nix | 2 +- pkgs/data/fonts/dejavu-fonts/default.nix | 4 ++-- pkgs/data/fonts/fontWrap/default.nix | 2 +- pkgs/data/fonts/freefont-ttf/default.nix | 2 +- pkgs/data/fonts/junicode/default.nix | 2 +- pkgs/data/fonts/lmodern/default.nix | 4 ++-- pkgs/data/fonts/mph-2b-damase/default.nix | 2 +- .../data/fonts/redhat-liberation-fonts/default.nix | 4 ++-- pkgs/data/fonts/ttf-bitstream-vera/default.nix | 2 +- pkgs/data/fonts/unifont/default.nix | 2 +- pkgs/data/fonts/vista-fonts/default.nix | 2 +- pkgs/data/fonts/wqy-zenhei/default.nix | 2 +- pkgs/data/misc/cacert/default.nix | 2 +- pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh | 8 +++---- .../sgml+xml/schemas/xml-dtd/xhtml1/default.nix | 2 +- .../stylesheets/xslt/docbook-xsl-ns/default.nix | 2 +- .../stylesheets/xslt/docbook-xsl/builder.sh | 2 +- pkgs/desktops/gnome-2/platform/gtk-doc/default.nix | 2 +- pkgs/development/compilers/abc/builder-binjar.sh | 2 +- pkgs/development/compilers/abc/builder.sh | 4 ++-- pkgs/development/compilers/abc/jasmin/builder.sh | 2 +- pkgs/development/compilers/abc/polyglot/builder.sh | 2 +- pkgs/development/compilers/abc/soot/builder.sh | 2 +- .../compilers/adobe-flex-sdk/default.nix | 2 +- pkgs/development/compilers/aspectj/builder.sh | 2 +- pkgs/development/compilers/ccl/default.nix | 4 ++-- pkgs/development/compilers/cmucl/binary.nix | 2 +- pkgs/development/compilers/eql/default.nix | 2 +- pkgs/development/compilers/fpc/lazarus.nix | 2 +- pkgs/development/compilers/ghc/6.10.2-binary.nix | 4 ++-- pkgs/development/compilers/ghc/6.12.1-binary.nix | 2 +- pkgs/development/compilers/ghc/6.4.2-binary.nix | 4 ++-- pkgs/development/compilers/ghc/6.6.1.nix | 2 +- pkgs/development/compilers/ghc/with-packages.nix | 6 ++--- pkgs/development/compilers/ghc/wrapper.nix | 4 ++-- pkgs/development/compilers/gnatboot/default.nix | 2 +- pkgs/development/compilers/go/default.nix | 6 ++--- pkgs/development/compilers/gwt/builder.sh | 4 ++-- pkgs/development/compilers/haxe/default.nix | 4 ++-- pkgs/development/compilers/jdk/builder.sh | 2 +- .../compilers/jdk/dlj-bundle-builder.sh | 2 +- pkgs/development/compilers/jdk/ibm-builder.sh | 2 +- pkgs/development/compilers/llvm/dragonegg.nix | 2 +- pkgs/development/compilers/neko/default.nix | 2 +- .../compilers/nvidia-cg-toolkit/default.nix | 10 ++++----- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.1.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- .../compilers/ocaml/ber-metaocaml-003.nix | 2 +- .../development/compilers/ocaml/metaocaml-3.09.nix | 2 +- pkgs/development/compilers/opa/default.nix | 2 +- .../compilers/openjdk-darwin/default.nix | 2 +- pkgs/development/compilers/openjdk/default.nix | 6 ++--- pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/compilers/qi/default.nix | 4 ++-- pkgs/development/compilers/scala/default.nix | 2 +- pkgs/development/compilers/stalin/default.nix | 10 ++++----- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/compilers/visual-c++/builder.sh | 4 ++-- .../compilers/visual-c++/test/builder.sh | 2 +- pkgs/development/compilers/vs90wrapper/default.nix | 2 +- pkgs/development/interpreters/acl2/default.nix | 2 +- .../interpreters/angelscript/default.nix | 4 ++-- pkgs/development/interpreters/clojure/binary.nix | 2 +- pkgs/development/interpreters/clojure/clooj.nix | 2 +- pkgs/development/interpreters/clojure/default.nix | 2 +- pkgs/development/interpreters/groovy/default.nix | 2 +- pkgs/development/interpreters/j/default.nix | 4 ++-- pkgs/development/interpreters/jruby/default.nix | 2 +- pkgs/development/interpreters/kona/default.nix | 2 +- pkgs/development/interpreters/lua-5/default.nix | 2 +- pkgs/development/interpreters/maude/default.nix | 2 +- pkgs/development/interpreters/perl/5.8/default.nix | 2 +- .../interpreters/php-xdebug/default.nix | 2 +- pkgs/development/interpreters/picolisp/default.nix | 2 +- .../interpreters/python/pythonhome-wrapper.nix | 2 +- pkgs/development/interpreters/python/wrapper.nix | 2 +- .../interpreters/spidermonkey/builder.sh | 6 ++--- pkgs/development/libraries/Xaw3d/builder.sh | 2 +- pkgs/development/libraries/box2d/2.0.1.nix | 6 ++--- pkgs/development/libraries/chipmunk/default.nix | 2 +- pkgs/development/libraries/clapack/default.nix | 2 +- pkgs/development/libraries/cminpack/default.nix | 2 +- pkgs/development/libraries/dotnetfx35/default.nix | 2 +- pkgs/development/libraries/dotnetfx40/default.nix | 2 +- pkgs/development/libraries/eglibc/builder.sh | 2 +- pkgs/development/libraries/glfw/default.nix | 2 +- pkgs/development/libraries/glibc-2.13/default.nix | 2 +- pkgs/development/libraries/glibc-2.13/info.nix | 2 +- pkgs/development/libraries/glibc-2.13/locales.nix | 2 +- pkgs/development/libraries/glibc-2.14/default.nix | 2 +- pkgs/development/libraries/glibc-2.14/info.nix | 2 +- pkgs/development/libraries/glibc-2.14/locales.nix | 2 +- pkgs/development/libraries/glibc-2.9/default.nix | 2 +- pkgs/development/libraries/glibc-2.9/info.nix | 2 +- pkgs/development/libraries/glibc-2.9/locales.nix | 2 +- pkgs/development/libraries/gsm/default.nix | 2 +- pkgs/development/libraries/haskell/cabal/cabal.nix | 4 ++-- pkgs/development/libraries/hawknl/default.nix | 2 +- pkgs/development/libraries/iniparser/default.nix | 6 ++--- .../libraries/java/geoipjava/default.nix | 2 +- .../libraries/java/gwt-dragdrop/builder.sh | 2 +- .../libraries/java/gwt-widgets/builder.sh | 2 +- pkgs/development/libraries/java/hsqldb/builder.sh | 2 +- .../libraries/java/hydra-ant-logger/default.nix | 2 +- .../libraries/java/jetty-gwt/default.nix | 2 +- .../libraries/java/jetty-util/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 4 ++-- pkgs/development/libraries/java/saxon/default8.nix | 2 +- pkgs/development/libraries/java/smack/builder.sh | 2 +- pkgs/development/libraries/java/swt/builder.sh | 4 ++-- pkgs/development/libraries/java/xalanj/default.nix | 2 +- pkgs/development/libraries/java/xerces/default.nix | 2 +- pkgs/development/libraries/levmar/default.nix | 2 +- pkgs/development/libraries/libdvdnav/default.nix | 2 +- pkgs/development/libraries/libdvdread/default.nix | 2 +- pkgs/development/libraries/libf2c/default.nix | 2 +- pkgs/development/libraries/libmilter/default.nix | 2 +- .../libraries/libopensc-dnie/default.nix | 2 +- pkgs/development/libraries/libpcap/default.nix | 2 +- pkgs/development/libraries/libpseudo/default.nix | 4 ++-- pkgs/development/libraries/libviper/default.nix | 4 ++-- pkgs/development/libraries/libvterm/default.nix | 4 ++-- pkgs/development/libraries/libxslt/default.nix | 2 +- pkgs/development/libraries/ncbi/default.nix | 2 +- pkgs/development/libraries/opencascade/default.nix | 2 +- pkgs/development/libraries/pdf2xml/default.nix | 2 +- pkgs/development/libraries/postgis/default.nix | 2 +- .../libraries/qtscriptgenerator/default.nix | 2 +- .../libraries/science/math/liblapack/default.nix | 2 +- pkgs/development/libraries/scmccid/default.nix | 2 +- pkgs/development/libraries/slib/default.nix | 2 +- pkgs/development/libraries/snack/default.nix | 2 +- .../development/libraries/speech-tools/default.nix | 2 +- pkgs/development/libraries/sphinxbase/default.nix | 4 ++-- pkgs/development/libraries/suitesparse/default.nix | 4 ++-- .../development/libraries/tcp-wrappers/default.nix | 2 +- pkgs/development/libraries/ti-rpc/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 4 ++-- pkgs/development/libraries/webkit/default.nix | 2 +- pkgs/development/libraries/webkit/svn.nix | 2 +- pkgs/development/libraries/wtk/builder.sh | 2 +- .../libraries/xapian/bindings/1.0.x.nix | 4 ++-- .../libraries/xapian/bindings/default.nix | 4 ++-- .../libraries/xlibs-wrapper/default.nix | 2 +- pkgs/development/misc/avr8-burn-omat/default.nix | 2 +- pkgs/development/misc/windows-sdk/builder.sh | 4 ++-- .../ocaml-modules/batteries/default.nix | 2 +- .../ocaml-modules/cryptokit/default.nix | 2 +- .../ocaml-modules/lablgtkmathview/default.nix | 2 +- pkgs/development/ocaml-modules/sqlite3/default.nix | 2 +- pkgs/development/perl-modules/DB_File/default.nix | 2 +- .../development/python-modules/generic/default.nix | 2 +- pkgs/development/python-modules/xmpppy/default.nix | 2 +- pkgs/development/ruby-modules/rake/default.nix | 4 ++-- pkgs/development/ruby-modules/sqlite3/default.nix | 2 +- .../tools/analysis/checkstyle/default.nix | 2 +- pkgs/development/tools/analysis/emma/default.nix | 2 +- .../tools/analysis/findbugs/default.nix | 2 +- .../development/tools/analysis/jdepend/default.nix | 2 +- pkgs/development/tools/analysis/pmd/default.nix | 2 +- pkgs/development/tools/analysis/spin/default.nix | 2 +- .../build-managers/apache-ant/from-source.nix | 4 ++-- .../tools/build-managers/bam/default.nix | 4 ++-- .../tools/build-managers/buildbot/default.nix | 2 +- .../tools/build-managers/gradle/default.nix | 2 +- .../tools/build-managers/jam/default.nix | 2 +- pkgs/development/tools/misc/cbrowser/default.nix | 2 +- pkgs/development/tools/misc/cscope/default.nix | 4 ++-- pkgs/development/tools/misc/global/default.nix | 2 +- pkgs/development/tools/misc/lsof/default.nix | 2 +- pkgs/development/tools/misc/ninka/default.nix | 4 ++-- pkgs/development/tools/misc/sloccount/default.nix | 6 ++--- pkgs/development/tools/misc/unifdef/default.nix | 2 +- .../tools/misc/usb-modeswitch/default.nix | 2 +- pkgs/development/tools/ocaml/camlidl/default.nix | 2 +- pkgs/development/tools/ocaml/findlib/default.nix | 2 +- pkgs/development/tools/parsing/antlr/builder.sh | 4 ++-- pkgs/development/tools/parsing/frown/builder.sh | 2 +- pkgs/development/tools/parsing/jikespg/builder.sh | 2 +- .../tools/selenium/remote-control/default.nix | 4 ++-- pkgs/development/web/csslint/default.nix | 2 +- pkgs/games/banner/default.nix | 2 +- pkgs/games/beret/default.nix | 4 ++-- pkgs/games/blackshades/default.nix | 2 +- pkgs/games/blackshadeselite/default.nix | 2 +- pkgs/games/castle-combat/default.nix | 2 +- pkgs/games/dwarf-fortress/default.nix | 4 ++-- pkgs/games/eduke32/default.nix | 4 ++-- pkgs/games/egoboo/default.nix | 2 +- pkgs/games/exult/default.nix | 2 +- pkgs/games/flightgear/default.nix | 2 +- pkgs/games/fsg/default.nix | 2 +- pkgs/games/icbm3d/default.nix | 2 +- pkgs/games/instead/default.nix | 2 +- pkgs/games/keen4/builder.sh | 4 ++-- pkgs/games/mars/default.nix | 4 ++-- pkgs/games/naev/default.nix | 2 +- pkgs/games/nethack/default.nix | 2 +- pkgs/games/neverball/default.nix | 2 +- pkgs/games/openlierox/default.nix | 2 +- pkgs/games/orbit/default.nix | 2 +- pkgs/games/pong3d/default.nix | 2 +- pkgs/games/privateer/default.nix | 2 +- pkgs/games/quake3/demo/builder.sh | 2 +- pkgs/games/quake3/game/default.nix | 2 +- pkgs/games/quake3/wrapper/builder.sh | 2 +- pkgs/games/rigsofrods/default.nix | 4 ++-- pkgs/games/sauerbraten/default.nix | 4 ++-- pkgs/games/simutrans/default.nix | 4 ++-- pkgs/games/teetertorture/default.nix | 2 +- pkgs/games/teeworlds/default.nix | 6 ++--- pkgs/games/the-butterfly-effect/default.nix | 4 ++-- pkgs/games/thePenguinMachine/default.nix | 4 ++-- pkgs/games/trackballs/default.nix | 2 +- pkgs/games/tremulous/default.nix | 4 ++-- pkgs/games/trigger/default.nix | 2 +- pkgs/games/urbanterror/default.nix | 4 ++-- pkgs/games/ut2004demo/make-wrapper.sh | 2 +- pkgs/games/vectoroids/default.nix | 2 +- pkgs/games/warsow/default.nix | 6 ++--- pkgs/games/xonotic/default.nix | 4 ++-- pkgs/games/xsokoban/default.nix | 2 +- pkgs/games/zangband/default.nix | 6 ++--- pkgs/games/zod/default.nix | 2 +- pkgs/misc/drivers/gutenprint/bin.nix | 2 +- pkgs/misc/emulators/atari800/builder.sh | 2 +- pkgs/misc/emulators/darcnes/default.nix | 2 +- pkgs/misc/emulators/dosbox/default.nix | 2 +- pkgs/misc/emulators/fakenes/default.nix | 2 +- pkgs/misc/emulators/mess/default.nix | 2 +- pkgs/misc/emulators/vice/default.nix | 2 +- pkgs/misc/foldingathome/default.nix | 2 +- pkgs/misc/gxemul/default.nix | 6 ++--- pkgs/misc/jackaudio/jack1.nix | 2 +- pkgs/misc/misc.nix | 2 +- pkgs/misc/sane-backends/default.nix | 2 +- pkgs/misc/sane-backends/snapshot.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 2 +- pkgs/misc/screensavers/rss-glx/builder.sh | 6 ++--- pkgs/misc/source-and-tags/default.nix | 4 ++-- pkgs/misc/tex/lazylist/builder.sh | 2 +- pkgs/misc/tex/lkproof/default.nix | 2 +- pkgs/misc/tex/nix/animatedot.sh | 2 +- pkgs/misc/tex/nix/default.nix | 2 +- pkgs/misc/tex/nix/dot2pdf.sh | 2 +- pkgs/misc/tex/nix/dot2ps.sh | 2 +- pkgs/misc/tex/nix/lhs2tex.sh | 2 +- pkgs/misc/tex/nix/run-latex.sh | 2 +- pkgs/misc/tex/pgf/1.x.nix | 2 +- pkgs/misc/tex/pgf/2.x.nix | 2 +- pkgs/misc/tex/polytable/builder.sh | 6 ++--- pkgs/misc/tex/tetex/default.nix | 4 ++-- pkgs/misc/tex/tex4ht/default.nix | 4 ++-- pkgs/misc/tex/texlive/aggregate.nix | 6 ++--- pkgs/misc/tex/texlive/beamer.nix | 4 ++-- pkgs/misc/tex/texlive/cm-super.nix | 12 +++++----- pkgs/misc/tex/texlive/context.nix | 4 ++-- pkgs/misc/tex/texlive/default.nix | 10 ++++----- pkgs/misc/tex/texlive/extra.nix | 2 +- pkgs/misc/tex/texlive/moderncv.nix | 2 +- pkgs/misc/tex/texlive/pgf.nix | 4 ++-- pkgs/misc/tex/texlive/xcolor.nix | 8 +++---- pkgs/misc/uboot/default.nix | 4 ++-- pkgs/misc/uboot/guruplug.nix | 4 ++-- pkgs/misc/uboot/nanonote.nix | 4 ++-- pkgs/misc/uboot/sheevaplug.nix | 4 ++-- pkgs/os-specific/linux/915resolution/default.nix | 2 +- pkgs/os-specific/linux/acpi-call/default.nix | 4 ++-- pkgs/os-specific/linux/ati-drivers/builder.sh | 6 ++--- pkgs/os-specific/linux/aufs/2.1.nix | 2 +- pkgs/os-specific/linux/aufs/2.nix | 2 +- pkgs/os-specific/linux/aufs/3.nix | 4 ++-- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 +- pkgs/os-specific/linux/cramfsswap/builder.sh | 2 +- pkgs/os-specific/linux/exmap/default.nix | 4 ++-- pkgs/os-specific/linux/ext3cow-tools/builder.sh | 2 +- .../firmware/firmware-linux-nonfree/default.nix | 2 +- .../os-specific/linux/firmware/ipw2100/default.nix | 2 +- .../os-specific/linux/firmware/ipw2200/default.nix | 2 +- .../linux/firmware/iwlwifi-1000-ucode/default.nix | 2 +- .../linux/firmware/iwlwifi-3945-ucode/default.nix | 2 +- .../linux/firmware/iwlwifi-4965-ucode/default.nix | 2 +- .../firmware/iwlwifi-4965-ucode/version-2.nix | 2 +- .../linux/firmware/iwlwifi-5000-ucode/default.nix | 2 +- .../linux/firmware/iwlwifi-5150-ucode/default.nix | 2 +- .../linux/firmware/iwlwifi-6000-ucode/default.nix | 2 +- .../firmware/iwlwifi-6000g2a-ucode/default.nix | 2 +- .../firmware/iwlwifi-6000g2b-ucode/default.nix | 2 +- pkgs/os-specific/linux/firmware/ralink/default.nix | 2 +- pkgs/os-specific/linux/firmware/rt2860/default.nix | 2 +- pkgs/os-specific/linux/firmware/rt2870/default.nix | 2 +- pkgs/os-specific/linux/firmware/rt73/default.nix | 2 +- .../linux/firmware/rtl8192c/default.nix | 2 +- pkgs/os-specific/linux/firmware/zd1211/default.nix | 2 +- pkgs/os-specific/linux/fxload/default.nix | 6 ++--- pkgs/os-specific/linux/kernel-headers/2.4.nix | 2 +- pkgs/os-specific/linux/kernel-headers/2.6.28.nix | 2 +- pkgs/os-specific/linux/kernel-headers/2.6.32.nix | 2 +- pkgs/os-specific/linux/kernel-headers/default.nix | 2 +- pkgs/os-specific/linux/kernel/builder.sh | 4 ++-- pkgs/os-specific/linux/klibc/shrunk.nix | 2 +- pkgs/os-specific/linux/kudzu/builder.sh | 8 +++---- pkgs/os-specific/linux/libcap/default.nix | 2 +- pkgs/os-specific/linux/lsiutil/default.nix | 2 +- pkgs/os-specific/linux/mingetty/default.nix | 2 +- pkgs/os-specific/linux/nss_ldap/default.nix | 2 +- pkgs/os-specific/linux/numactl/default.nix | 2 +- .../os-specific/linux/nvidia-x11/builder-legacy.sh | 8 +++---- pkgs/os-specific/linux/nvidia-x11/builder.sh | 20 ++++++++--------- pkgs/os-specific/linux/opengl/xorg-sys/builder.sh | 2 +- pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh | 2 +- pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh | 2 +- pkgs/os-specific/linux/pcmciautils/default.nix | 2 +- pkgs/os-specific/linux/qc-usb/builder.sh | 2 +- pkgs/os-specific/linux/radeontools/default.nix | 2 +- pkgs/os-specific/linux/sysklogd/builder.sh | 6 ++--- pkgs/os-specific/linux/tcp-wrapper/builder.sh | 10 ++++----- pkgs/os-specific/linux/tunctl/default.nix | 2 +- pkgs/os-specific/linux/upstart/default.nix | 2 +- pkgs/os-specific/linux/wis-go7007/default.nix | 8 +++---- pkgs/os-specific/linux/wpa_supplicant/default.nix | 4 ++-- .../linux/xf86-input-multitouch/default.nix | 2 +- .../os-specific/linux/xf86-input-wacom/default.nix | 2 +- pkgs/os-specific/windows/mingw-headers/default.nix | 2 +- pkgs/os-specific/windows/mingwrt/default.nix | 2 +- pkgs/os-specific/windows/w32api/default.nix | 2 +- pkgs/servers/dict/dictd-db-collector.nix | 2 +- pkgs/servers/dict/dictd-db.nix | 2 +- pkgs/servers/felix/default.nix | 2 +- pkgs/servers/felix/remoteshell.nix | 2 +- pkgs/servers/fingerd/bsd-fingerd/default.nix | 2 +- pkgs/servers/games/ghost-one/default.nix | 8 +++---- .../http/apache-modules/mod_python/default.nix | 2 +- .../apache-modules/tomcat-connectors/builder.sh | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/http/jboss/jdbc/mysql/builder.sh | 2 +- pkgs/servers/http/jetty/6.1/bin-builder.sh | 2 +- pkgs/servers/http/joseki/default.nix | 4 ++-- pkgs/servers/http/tomcat/axis2/builder.sh | 4 ++-- pkgs/servers/http/tomcat/jdbc/mysql/builder.sh | 2 +- pkgs/servers/mail/postfix/default.nix | 2 +- pkgs/servers/monitoring/zabbix/default.nix | 6 ++--- pkgs/servers/portmap/default.nix | 2 +- pkgs/servers/sql/mysql/jdbc/builder.sh | 2 +- pkgs/servers/sql/postgresql/jdbc/builder.sh | 2 +- pkgs/servers/x11/xorg/builder.sh | 2 +- pkgs/servers/x11/xorg/imake.sh | 2 +- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/servers/xmpp/pyIRCt/default.nix | 2 +- pkgs/servers/xmpp/pyMAILt/default.nix | 2 +- pkgs/shells/zsh/default.nix | 4 ++-- pkgs/stdenv/adapters.nix | 6 ++--- pkgs/stdenv/generic/setup.sh | 16 ++++++------- pkgs/stdenv/linux/default.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- pkgs/stdenv/mingw/setup.sh | 14 ++++++------ pkgs/tools/X11/x2vnc/default.nix | 2 +- pkgs/tools/X11/x2x/default.nix | 4 ++-- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/admin/tightvnc/builder.sh | 6 ++--- pkgs/tools/archivers/unarj/default.nix | 2 +- pkgs/tools/cd-dvd/unetbootin/default.nix | 6 ++--- pkgs/tools/compression/bsdiff/builder.sh | 4 ++-- pkgs/tools/compression/bzip2/builder.sh | 2 +- pkgs/tools/compression/upx/default.nix | 2 +- pkgs/tools/compression/zdelta/builder.sh | 2 +- pkgs/tools/filesystems/fsfs/default.nix | 2 +- pkgs/tools/filesystems/fusesmb/default.nix | 2 +- pkgs/tools/filesystems/httpfs/default.nix | 4 ++-- pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +- pkgs/tools/graphics/cfdg/default.nix | 4 ++-- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/dcraw/default.nix | 2 +- pkgs/tools/graphics/exiftags/default.nix | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/jhead/default.nix | 2 +- pkgs/tools/graphics/pdfread/default.nix | 4 ++-- pkgs/tools/graphics/ploticus/builder.sh | 4 ++-- pkgs/tools/graphics/qrdecode/default.nix | 2 +- pkgs/tools/graphics/transfig/builder.sh | 4 ++-- pkgs/tools/graphics/welkin/default.nix | 2 +- pkgs/tools/misc/autojump/default.nix | 4 ++-- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- pkgs/tools/misc/dmg2img/default.nix | 2 +- pkgs/tools/misc/dtach/default.nix | 2 +- pkgs/tools/misc/expect/default.nix | 2 +- pkgs/tools/misc/fdupes/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 2 +- pkgs/tools/misc/hddtemp/default.nix | 2 +- pkgs/tools/misc/jdiskreport/builder.sh | 4 ++-- pkgs/tools/misc/kermit/default.nix | 6 ++--- pkgs/tools/misc/memtest86/default.nix | 2 +- pkgs/tools/misc/myhasktags/default.nix | 2 +- pkgs/tools/misc/pk2cmd/default.nix | 2 +- pkgs/tools/misc/qjoypad/default.nix | 2 +- pkgs/tools/misc/rockbox-utility/default.nix | 2 +- pkgs/tools/misc/shebangfix/default.nix | 2 +- pkgs/tools/misc/ttf2pt1/default.nix | 2 +- pkgs/tools/misc/ttmkfdir/default.nix | 2 +- pkgs/tools/misc/vfdecrypt/default.nix | 2 +- pkgs/tools/misc/w3c-css-validator/default.nix | 2 +- pkgs/tools/misc/xdaliclock/default.nix | 2 +- pkgs/tools/networking/altermime/default.nix | 2 +- pkgs/tools/networking/bsd-finger/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 6 ++--- pkgs/tools/networking/ddclient/default.nix | 2 +- pkgs/tools/networking/dnstop/default.nix | 2 +- pkgs/tools/networking/eggdrop/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/host/default.nix | 4 ++-- pkgs/tools/networking/miniupnpc/default.nix | 2 +- pkgs/tools/networking/miniupnpd/default.nix | 2 +- pkgs/tools/networking/netboot/default.nix | 2 +- pkgs/tools/networking/netkit/tftp/default.nix | 2 +- pkgs/tools/networking/openssh/default.nix | 4 ++-- pkgs/tools/networking/p2p/azureus/builder.sh | 4 ++-- pkgs/tools/networking/p2p/rtorrent/default.nix | 2 +- pkgs/tools/networking/p2p/tahoe-lafs/default.nix | 2 +- pkgs/tools/networking/philter/default.nix | 2 +- pkgs/tools/networking/ripmime/default.nix | 2 +- pkgs/tools/networking/rp-pppoe/default.nix | 2 +- pkgs/tools/networking/s3sync/default.nix | 4 ++-- pkgs/tools/networking/siege/default.nix | 2 +- pkgs/tools/networking/slimrat/default.nix | 2 +- pkgs/tools/networking/stun/default.nix | 2 +- pkgs/tools/networking/swec/default.nix | 2 +- pkgs/tools/networking/tcng/default.nix | 2 +- pkgs/tools/networking/uwimap/default.nix | 2 +- pkgs/tools/networking/wakelan/default.nix | 2 +- pkgs/tools/networking/wicd/default.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/security/chkrootkit/default.nix | 2 +- pkgs/tools/security/metasploit/3.1.nix | 4 ++-- .../tools/security/opensc-dnie-wrapper/default.nix | 2 +- pkgs/tools/security/pius/default.nix | 4 ++-- pkgs/tools/security/seccure/0.4.nix | 2 +- pkgs/tools/security/ssss/default.nix | 2 +- pkgs/tools/system/bootchart/default.nix | 2 +- pkgs/tools/system/cron/default.nix | 2 +- pkgs/tools/system/dd_rescue/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 4 ++-- pkgs/tools/system/plan9port/builder.sh | 2 +- pkgs/tools/text/convertlit/default.nix | 2 +- pkgs/tools/text/dadadodo/default.nix | 2 +- pkgs/tools/text/qshowdiff/default.nix | 2 +- pkgs/tools/text/replace/default.nix | 2 +- pkgs/tools/text/xml/jing/script-builder.sh | 2 +- pkgs/tools/text/xml/rxp/default.nix | 2 +- pkgs/tools/text/xml/trang/builder.sh | 4 ++-- pkgs/tools/typesetting/asciidoc/default.nix | 2 +- pkgs/tools/typesetting/halibut/default.nix | 4 ++-- pkgs/tools/typesetting/lhs2tex/default.nix | 4 ++-- pkgs/tools/typesetting/pdfjam/builder.sh | 4 ++-- pkgs/tools/typesetting/pdftk/default.nix | 2 +- .../amazon-ec2-ami-tools/default.nix | 2 +- .../amazon-ec2-api-tools/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- pkgs/top-level/make-tarball.nix | 6 ++--- pkgs/top-level/python-packages.nix | 6 ++--- 627 files changed, 926 insertions(+), 926 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c9f0fb98af73..2a0caf930015 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; buildPhase = '' - ensureDir $out + mkdir -p $out export CXX=g++ scons PREFIX=$out install ''; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index bdda1c6d8d96..e75be3e2c2be 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postInstall = '' cp ${keymap}.keymap $out/share/gmu/default.keymap cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf - ensureDir $out/etc/gmu + mkdir -p $out/etc/gmu cp gmu.${conf}.conf $out/etc/gmu/gmu.conf ''; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 7f062b1799fa..8e7f573cc849 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/bin $out/man/man1 + mkdir -p $out/bin $out/man/man1 ''; meta = { diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 1557913f4017..b563c850d528 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { postInstall = '' - ensureDir $out/share/ladspa/ + mkdir -p $out/share/ladspa/ ln -sv $out/lib/ladspa $out/share/ladspa/lib ''; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 8cd3dcc1bfba..30ba34af16c5 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -13,7 +13,7 @@ in in with localDefs; let copyFile = fullDepEntry (" - ensureDir \$out/include + mkdir -p \$out/include cp ${src} \$out/include/ladspa.h ") [minInit defEnsureDir]; in diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 86ffca4242fa..d5a8138a5001 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; preInstall = - '' ensureDir "$out/bin" - ensureDir "$out/man/man1" + '' mkdir -p "$out/bin" + mkdir -p "$out/man/man1" ''; meta = { diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index 4ea26b458a7c..ccaa428a3f41 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = # XXX: Should install locales too (though there's only 1 available). - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v mpc123 "$out/bin" ''; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index e7957e866f1a..c295767687f6 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -40,7 +40,7 @@ rec { makeDocsWork = fullDepEntry '' # hackish way to make html docs work - h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h" + h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h" patch -p1 < ${./doc.patch} sed "s@HTML-DIR@$h@" -i index.scm snd-help.c '' ["defEnsureDir"]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index d3ac4c4168c8..3a2beff04133 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/{bin,share/sonic-visualiser} + mkdir -p $out/{bin,share/sonic-visualiser} cp sonic-visualiser/sonic-visualiser $out/bin cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index b751e4da33ed..279820a723fb 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libX11 makeWrapper tcl tk ]; configurePhase = '' - ensureDir $out/bin + mkdir -p $out/bin sed -e "s@/usr/local@$out@" -i Makefile ''; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 528f0b3412c1..0cfbfb4c9bd1 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { ladspaPlugins liblo pkgconfig ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib cp src/Xsynth_gtk $out/bin cp src/.libs/* $out/lib ''; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index bc53dfc70f32..801efc166daa 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -27,7 +27,7 @@ let buildCommand = '' # Unpack tarball. - ensureDir $out + mkdir -p $out tar xfvz $src -C $out # Patch binaries. @@ -47,7 +47,7 @@ let --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; # */ diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 511e284ed39e..e1d2ad69b1dd 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 ''; installPhase = '' - ensureDir $out/bin $out/share/elvis $out/share/elvis/doc + mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc cp elvis ref elvtags elvfmt $out/bin cp -R data/* $out/share/elvis cp doc/* $out/share/elvis/doc - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 for a in doc/*.man; do cp $a $out/share/man/man1/`basename $a .man`.1 done diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 52afebc6297b..ec7a3e8e6002 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [emacs texinfo ctags]; configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; - preInstall = "ensureDir $out/info"; + preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' mv $out/info $out/share/ diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 6a91ac496517..46381dfc648d 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { checkPhase = "make utest"; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp" chmod a-x "$out/share/emacs/site-lisp/"* - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v */*.info* */*/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 258c13b8eb70..f94d594519ce 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp" - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v info-help/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 3a9770314366..5439ba9e4d6e 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { s|/usr/include/taglib|${taglib}/include/taglib|g ; s|/usr/lib|${taglib}/lib|g ; s|^all:\(.*\)\$|all:\1 emms-print-metadata|g" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" sed -i "emms-player-mpg321-remote.el" \ -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ensureDir "$out/bin" && cp emms-print-metadata "$out/bin" + mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin" ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 5813fde815f8..b73d91b611c8 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [emacs]; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" ''; diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index 9dba1d599fff..24eba20be6cc 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' DEST=$out/share/emacs/site-lisp - ensureDir $DEST + mkdir -p $DEST cp -a * $DEST ''; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 2d93e782048a..02f60d0d698d 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -23,7 +23,7 @@ in ]; configurePhase = '' - ensureDir "dist" + mkdir -p "dist" cat > build.properties < EOF sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit - ensureDir $out/bin + mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit chmod +x $out/bin/jedit ''; diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix index 8af3d96918d8..1126a7278d6c 100644 --- a/pkgs/applications/editors/jedit/wrapper.nix +++ b/pkgs/applications/editors/jedit/wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { phases = "buildPhase"; buildPhase = " -ensureDir \$out/bin +mkdir -p \$out/bin cat > \$out/bin/${jedit.name} << EOF #!/bin/sh exec $java -jar $jeditjar \\$* diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh index 51b5f1836546..15706b0c37dd 100644 --- a/pkgs/applications/editors/nedit/builder.sh +++ b/pkgs/applications/editors/nedit/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p source/nedit source/nc $out/bin } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index c759f977b0d4..81e0dd35db95 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/share/vi/catalog + mkdir -p $out/bin $out/share/vi/catalog for a in dutch english french german ru_SU.KOI8-R spanish swedish; do cp ../catalog/$a $out/share/vi/catalog done @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/nvi $out/bin/ex ln -s $out/bin/nvi $out/bin/view - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1 ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3c900ca1eba2..b80d27bfcf9b 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -15,11 +15,11 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - ensureDir ${targetScriptDir}; + mkdir -p ${targetScriptDir}; for p in "$@"; do cp "$p" ${targetScriptDir}; done } installPlugins(){ - ensureDir ${targetPluginDir}; + mkdir -p ${targetPluginDir}; for p in "$@"; do cp "$p" ${targetPluginDir}; done } ''; @@ -137,7 +137,7 @@ rec { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; @@ -190,7 +190,7 @@ rec { }; installPhase = " installPlugins ufraw-gimp - ensureDir $out/bin + mkdir -p $out/bin cp ufraw $out/bin "; }; @@ -209,7 +209,7 @@ rec { installPhase = " installPlugins gimplensfun - ensureDir $out/bin + mkdir -p $out/bin cp gimplensfun $out/bin "; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 795417dbf5b3..2557f0f82e58 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; postInstall = '' - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages ''; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 7c3826369ee9..dc397a614d3d 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { ''; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin echo '#!/bin/sh' > $out/bin/jbrout echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout chmod +x $out/bin/jbrout diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 8ddaf9bc2792..9b39d8e8f1f7 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/opt/meshlab $out/bin $out/lib + mkdir -p $out/opt/meshlab $out/bin $out/lib pushd distrib cp -R * $out/opt/meshlab popd diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 8f7ba7929147..e3c6deddb295 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ libtiff gettext]; preInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ''; meta = { diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 12f01adc8300..349982bc24cb 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries? installPhase = '' - ensureDir $out/lib/pinta $out/bin + mkdir -p $out/lib/pinta $out/bin cp bin/*.{dll,exe} $out/lib/pinta cat > $out/bin/pinta << EOF #!/bin/sh diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index eda187cbf235..4b61ac740cb9 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; installPhase = '' - ensureDir $out/bin $out/lib + mkdir -p $out/bin $out/lib cp rtgui/rt $out/bin # Weird kind of path reference cp -r ../release/* $out/bin diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index b40a72512831..6d39c7f2a95f 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ erlang esdl ]; installPhase = '' - ensureDir $out/bin $out/lib/${name}/ebin + mkdir -p $out/bin $out/lib/${name}/ebin cp ebin/* $out/lib/${name}/ebin cp -R fonts textures shaders plugins $out/lib/$name cat << EOF > $out/bin/wings diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index a746eb86b940..307c94779296 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -22,7 +22,7 @@ rec { preConfigure = a.fullDepEntry ('' sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') - ensureDir $out/share/locale + mkdir -p $out/share/locale '') ["doUnpack" "minInit" "defEnsureDir"]; name = "xaos-" + version; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index cd4bebfe9ad0..1f4844a22c46 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup echo "unpacking $src..." tar xvfa $src -ensureDir $out/Adobe/Reader9 +mkdir -p $out/Adobe/Reader9 echo "unpacking reader..." set +e @@ -24,5 +24,5 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \ --replace /bin/ls $(type -P ls) \ --replace xargs "xargs -r" -ensureDir $out/bin +mkdir -p $out/bin ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index ab22312e9033..caaa5133c754 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ snack tcl tk makeWrapper ]; installPhase = '' - ensureDir $out/{bin,nix-support,share/wavesurfer/} + mkdir -p $out/{bin,nix-support,share/wavesurfer/} mv doc $out/share/wavesurfer mv * $out/nix-support ln -s $out/{nix-support,bin}/wavesurfer.tcl diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index d56ebe6b17f1..de74cd6abd9a 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bitcoin-qt $out/bin cp src/bitcoind $out/bin ''; diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix index 6a66c45b94fc..b27f60e9bffa 100644 --- a/pkgs/applications/misc/blender/2.49.nix +++ b/pkgs/applications/misc/blender/2.49.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 24071d3c6838..f67138e66a77 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { # JDK 7 beta seems to have fixed this (bug ?) installPhase = '' - ensureDir $out/{bin,nix-support} + mkdir -p $out/{bin,nix-support} cp -r ../bin/dist $out/nix-support sed -i 's/which/type -p/' $out/nix-support/dist/freemind