diff options
Diffstat (limited to 'pkgs/tools/networking')
28 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a98f307c77dc..8335b0eb8db3 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -31,7 +31,7 @@ rec { phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" - ensureDir "$out/bin" + mkdir -p "$out/bin" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index fc29af989cea..808c738110e0 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index f58650207854..cd3ae12a11b8 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { buildInputs = [ which ]; installPhase = '' - ensureDir $out/bin; cp cntlm $out/bin/; - ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; - ensureDir $out/man/; cp doc/cntlm.1 $out/man/; + mkdir -p $out/bin; cp cntlm $out/bin/; + mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; + mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; meta = { diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 7c1e89083b87..e57ba489450f 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -15,7 +15,7 @@ buildPerlPackage { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ddclient $out/bin ''; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index cdab68f22ea9..c9e1b58d2d2c 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libpcap ncurses ]; preInstall = '' - ensureDir $out/share/man/man8 $out/bin + mkdir -p $out/share/man/man8 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index c55688d5060a..8649eda4bf71 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' prefix=$out/eggdrop - ensureDir $prefix + mkdir -p $prefix ''; postConfigure = '' diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c3ac4e205ae2..cbc07522019a 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp flvstreamer $out/bin cp streams $out/bin cp rtmpsrv $out/bin diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 9383b857a3a7..c74dbe528290 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -11,8 +11,8 @@ let version = "20000331"; in preConfigure = '' makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" ''; installTargets = "install man"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 1039cadb3ee5..34ec8eed90ea 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man3 + mkdir -p $out/share/man/man3 cp man3/miniupnpc.3 $out/share/man/man3/ ''; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 5d62222d1419..6db47f8e079f 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp miniupnpd.1 $out/share/man/man1/ ''; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index a834ffc37396..684507a1d2e0 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -37,7 +37,7 @@ rec { '' ["doUnpack" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp netboot "$out/bin" '' ["defEnsureDir" "minInit"]; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index adf85a981d1b..6b9763972dfb 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = " - ensureDir $out/man/man{1,8} $out/sbin $out/bin + mkdir -p $out/man/man{1,8} $out/sbin $out/bin "; meta = { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 69243b4f68e9..7cadf8a1345d 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --with-privsep-path=$out/empty" - ensureDir $out/empty + mkdir -p $out/empty ''; postInstall = @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/ssh-copy-id cp contrib/ssh-copy-id.1 $out/share/man/man1/ - ensureDir $out/etc/ssh + mkdir -p $out/etc/ssh cp moduli $out/etc/ssh/ ''; diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh index 13b7a4831927..9d41dba2e439 100644 --- a/pkgs/tools/networking/p2p/azureus/builder.sh +++ b/pkgs/tools/networking/p2p/azureus/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/azureus.jar -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/azureus <<EOF #! $SHELL -e azureusHome=$out diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 4056c6429b06..ae52865eace8 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 ''; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b48600a9f996..5ef4a640d2a0 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,7 +66,7 @@ buildPythonPackage { # something writable doesn't help; providing $FONTCONFIG_FILE doesn't # help either. So we just don't run `make' under `docs/'. - ensureDir "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 8ade37976b6a..7457a72b5d50 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -32,7 +32,7 @@ rec { installProgram = a.fullDepEntry('' mv "$out/share/philter/".*rc "$out/share/philter/philterrc" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp "$out/share/philter/src/philter.py" "$out/bin/philter" chmod a+x "$out/bin/philter" '') ["addInputs" "copyToShare" "minInit"]; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 895b2c4be4fd..07196b77d0a2 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -30,7 +30,7 @@ rec { phaseNames = ["fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" - ensureDir "$out/bin" "$out/man/man1" + mkdir -p "$out/bin" "$out/man/man1" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 8a704bb57118..5079b951a645 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -32,7 +32,7 @@ rec { '') ["minInit" "doUnpack"]; makeDirs = a.fullDepEntry('' - ensureDir $out/share/${name}/etc/ppp + mkdir -p $out/share/${name}/etc/ppp '') ["minInit" "defEnsureDir"]; name = "rp-pppoe-" + version; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8ed71c345234..48788d36884c 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/libexec/s3sync + mkdir -p $out/libexec/s3sync cp *.rb $out/libexec/s3sync makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync - ensureDir $out/share/doc/s3sync + mkdir -p $out/share/doc/s3sync cp README* $out/share/doc/s3sync/ ''; # */ diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index bb588f365999..ebbfcb5d3608 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,etc} + mkdir -p "$out/"{bin,lib,share/man,etc} '' ["defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 38b7c27b6fde..9006fadfcdb9 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/slimrat $out/bin + mkdir -p $out/share/slimrat $out/bin cp -R src/* $out/share/slimrat # slimrat-gui does not work (it needs the Gtk2 perl package) for i in slimrat; do diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 65a1d241c0bd..795c0cfc8ccb 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/{bin,man/man8,man/man1} + mkdir -p $out/{bin,man/man8,man/man1} cp client $out/bin/stun cp server $out/bin/stund cp debian/manpages/stund.8 $out/man/man8 diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 4cb47fada061..007efa42827a 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -v default.sdf "$out/share/${name}" sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix index dd2082d30b24..062977b455c3 100644 --- a/pkgs/tools/networking/tcng/default.nix +++ b/pkgs/tools/networking/tcng/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { # manually copy tcc and include files.. see comment above installPhase = '' - ensureDir $out{,/sbin,/lib/tcng/include} + mkdir -p $out{,/sbin,/lib/tcng/include} make DESTDIR=$out install cp tcc/tcc $out/sbin cp tcc/*.tc $out/lib/tcng/include diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 7d72016cfe27..8c8c02412049 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include cp c-client/*.h c-client/linkage.c $out/include cp c-client/c-client.a $out/lib/libc-client.a cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 6cc18ec8678f..837ab3627faf 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/man/man1 $out/bin + mkdir -p $out/man/man1 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 19f30713a9fe..9c1f8c8dd39e 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' python setup.py install --prefix=$out - ensureDir $out/share/other + mkdir -p $out/share/other cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the |