From c9da6ff7361ca65c61bdd6fd6cd4ebac94b6d038 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Mar 2012 19:35:41 +0000 Subject: [PATCH] Move dev/libs/telepathy-* to a subdir svn path=/nixpkgs/trunk/; revision=33079 --- .../{telepathy-farsight => telepathy/farsight}/default.nix | 0 .../{telepathy-glib => telepathy/glib}/default.nix | 0 .../{telepathy-glib => telepathy/glib}/fix-pkgconfig.patch | 0 .../libraries/{telepathy-qt => telepathy/qt}/default.nix | 0 .../{telepathy-qt => telepathy/qt}/missing-include.patch | 0 pkgs/top-level/all-packages.nix | 6 +++--- 6 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/{telepathy-farsight => telepathy/farsight}/default.nix (100%) rename pkgs/development/libraries/{telepathy-glib => telepathy/glib}/default.nix (100%) rename pkgs/development/libraries/{telepathy-glib => telepathy/glib}/fix-pkgconfig.patch (100%) rename pkgs/development/libraries/{telepathy-qt => telepathy/qt}/default.nix (100%) rename pkgs/development/libraries/{telepathy-qt => telepathy/qt}/missing-include.patch (100%) diff --git a/pkgs/development/libraries/telepathy-farsight/default.nix b/pkgs/development/libraries/telepathy/farsight/default.nix similarity index 100% rename from pkgs/development/libraries/telepathy-farsight/default.nix rename to pkgs/development/libraries/telepathy/farsight/default.nix diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix similarity index 100% rename from pkgs/development/libraries/telepathy-glib/default.nix rename to pkgs/development/libraries/telepathy/glib/default.nix diff --git a/pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch similarity index 100% rename from pkgs/development/libraries/telepathy-glib/fix-pkgconfig.patch rename to pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch diff --git a/pkgs/development/libraries/telepathy-qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix similarity index 100% rename from pkgs/development/libraries/telepathy-qt/default.nix rename to pkgs/development/libraries/telepathy/qt/default.nix diff --git a/pkgs/development/libraries/telepathy-qt/missing-include.patch b/pkgs/development/libraries/telepathy/qt/missing-include.patch similarity index 100% rename from pkgs/development/libraries/telepathy-qt/missing-include.patch rename to pkgs/development/libraries/telepathy/qt/missing-include.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4442b23cc7..c6ab9ffc4e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4731,13 +4731,13 @@ let tecla = callPackage ../development/libraries/tecla { }; - telepathy_glib = callPackage ../development/libraries/telepathy-glib { }; + telepathy_glib = callPackage ../development/libraries/telepathy/glib { }; - telepathy_farsight = callPackage ../development/libraries/telepathy-farsight { + telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { inherit (pkgs.gst_all) gstPluginsBase gstreamer gst_python; }; - telepathy_qt = callPackage ../development/libraries/telepathy-qt { }; + telepathy_qt = callPackage ../development/libraries/telepathy/qt { }; tk = callPackage ../development/libraries/tk { };