Move some IM clients to instant-messengers/

svn path=/nixpkgs/trunk/; revision=33065

7 files changed, 7 insertions, 6 deletions

diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 276df1ae7a158..276df1ae7a158 100644
--- a/pkgs/applications/networking/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/instant-messengers/kphone/default.nix
index dceb24a48b894..dceb24a48b894 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kphone/default.nix
diff --git a/pkgs/applications/networking/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 04e119afdb142..04e119afdb142 100644
--- a/pkgs/applications/networking/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index f94d7e125f65a..f94d7e125f65a 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/telepathy-gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 154057b9377e4..154057b9377e4 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/telepathy-gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 0824210c4b56c..0824210c4b56c 100644
--- a/pkgs/applications/networking/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f0b17b3e13cd..069c9ad3a029c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7000,7 +7000,7 @@ let
 
   links2 = callPackage ../applications/networking/browsers/links2 { };
 
-  linphone = callPackage ../applications/networking/linphone {
+  linphone = callPackage ../applications/networking/instant-messengers/linphone {
     inherit (gnome) libglade;
   };
 
@@ -7330,7 +7330,7 @@ let
 
   siproxd = callPackage ../applications/networking/siproxd { };
 
-  skype_linux = callPackage_i686 ../applications/networking/skype {
+  skype_linux = callPackage_i686 ../applications/networking/instant-messengers/skype {
     usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug)
   };
 
@@ -7433,7 +7433,7 @@ let
 
   taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { };
 
-  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy-gabble {
+  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
     inherit (pkgs.gnome) libsoup;
   };
 
@@ -7465,7 +7465,7 @@ let
 
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
-  twinkle = callPackage ../applications/networking/twinkle {
+  twinkle = callPackage ../applications/networking/instant-messengers/twinkle {
     boost = boostFull;
     ccrtp = ccrtp_1_8;
     libzrtpcpp = libzrtpcpp_1_6;
@@ -8005,7 +8005,7 @@ let
       inherit (kde3) kdelibs;
     };
 
-    kphone = callPackage ../applications/networking/kphone {
+    kphone = callPackage ../applications/networking/instant-messengers/kphone {
       stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
     };
 
@@ -8379,7 +8379,8 @@ let
 
   dpkg = callPackage ../tools/package-management/dpkg { };
 
-  ekiga = newScope (pkgs.gtkLibs // pkgs.gnome) ../applications/networking/ekiga { };
+  ekiga = newScope (pkgs.gtkLibs // pkgs.gnome)
+    ../applications/networking/instant-messengers/ekiga { };
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };