From bf1e734f85115778ada8188094cc2581a6f221d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Aug 2006 15:05:30 +0000
Subject: [PATCH] * Don't use the subpath operator (~) anymore, it's subsumed
 by normal   concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
---
 .../networking/browsers/firefox-wrapper/default.nix         | 2 +-
 pkgs/development/interpreters/xulrunner/wrapper/default.nix | 2 +-
 pkgs/development/tools/misc/help2man/default.nix            | 2 +-
 pkgs/development/tools/misc/help2man/help2man-1.36.4.nix    | 2 +-
 pkgs/games/zoom/default.nix                                 | 2 +-
 pkgs/misc/tex/nix/default.nix                               | 2 +-
 pkgs/stdenv/linux/default.nix                               | 4 ++--
 pkgs/stdenv/nix/default.nix                                 | 4 ++--
 pkgs/tools/networking/p2p/bittorrent/default.nix            | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
index 909a52d0a417..a63dd61b2434 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
-  plugins = map (x: x ~ x.mozillaPlugin) plugins;
+  plugins = map (x: x + x.mozillaPlugin) plugins;
 
   meta = {
     description = firefox.meta.description + " (with various plugins)";
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/default.nix b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
index e6d8ee6bbd5c..658cd74cde1c 100644
--- a/pkgs/development/interpreters/xulrunner/wrapper/default.nix
+++ b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
@@ -5,5 +5,5 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   inherit xulrunner launcher;
-  appfile = application ~ "application.ini";
+  appfile = application + /application.ini;
 }
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index fc1583496b49..d9463bbe75e3 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   ];
 
   # So that configure can find `preloadable_libintl.so'.
-  LD_LIBRARY_PATH = gettext ~ "/lib";
+  LD_LIBRARY_PATH = gettext + /lib;
 
   inherit gettext;
 }
diff --git a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
index 9fc982189a11..1b2f715b7dc6 100644
--- a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
+++ b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   ];
 
   # So that configure can find `preloadable_libintl.so'.
-  LD_LIBRARY_PATH = gettext ~ "/lib";
+  LD_LIBRARY_PATH = gettext + /lib;
 
   inherit gettext;
 }
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index e4823da2c426..129f431de8e1 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -10,5 +10,5 @@ stdenv.mkDerivation {
   };
   buildInputs = [perl expat xlibs freetype];
   # Zoom doesn't add the right directory in the include path.
-  CFLAGS = ["-I" (freetype ~ /include/freetype2)];
+  CFLAGS = ["-I" (freetype + /include/freetype2)];
 }
diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix
index e9ff838bd503..83b299ac82d2 100644
--- a/pkgs/misc/tex/nix/default.nix
+++ b/pkgs/misc/tex/nix/default.nix
@@ -32,7 +32,7 @@ rec {
     pkgs.stdenv.mkDerivation {
       name = "latex-includes";
 
-      realBuilder = pkgs.perl ~ "bin/perl";
+      realBuilder = pkgs.perl + /bin/perl;
       args = [ ./find-includes.pl ];
 
       rootFile = toString rootFile; # !!! hacky
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 9e4a1b4d4d33..d6c9b80f25e6 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -210,10 +210,10 @@ rec {
       inherit (stdenvLinuxBoot2Pkgs) binutils;
       glibc = stdenvLinuxGlibc;
       gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
-      shell = stdenvLinuxBoot3Pkgs.bash ~ /bin/sh;
+      shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh;
     };
 
-    shell = stdenvLinuxBoot3Pkgs.bash ~ /bin/sh;
+    shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh;
     
     extraAttrs = {
       curl = stdenvLinuxBoot3Pkgs.realCurl;
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 9c2de92f18f0..401ce2417b8f 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -17,10 +17,10 @@ import ../generic {
       else
         pkgs.binutils;
     gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
-    shell = pkgs.bash ~ /bin/sh;
+    shell = pkgs.bash + /bin/sh;
   };
 
-  shell = pkgs.bash ~ /bin/sh;
+  shell = pkgs.bash + /bin/sh;
 
   extraAttrs = {
     curl = pkgs.realCurl;
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
index f2ea431f11a3..e710d2665309 100644
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ b/pkgs/tools/networking/p2p/bittorrent/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, pygtk, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "bittorrent-4.4.0";
+  name = "bittorrent-4.9.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.bittorrent.com/dl/BitTorrent-4.4.0.tar.gz;
-    md5 = "74d4b48202c28f0b27e989b6d5f5b214";
+    url = http://download.bittorrent.com/dl/BitTorrent-4.9.8.tar.gz;
+    md5 = "30d14135a8c6869976cd807db019dfd9";
   };
   buildInputs = [python pygtk];
   inherit python pygtk makeWrapper;