diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix deleted file mode 100644 index f2340415be7f..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.0.nix +++ /dev/null @@ -1,13 +0,0 @@ -[ -{name="ktp-accounts-kcm";key="accounts_kcm";sha256="0i4x4z6w4l9ngx0j258p2vjmsnsdn8hckq7cfld1iliq6fxb1vwv";} -{name="ktp-approver";key="approver";sha256="0nj89jsina8b736sygxia8jmz6l81n6j0ffin8cpqbp9mczzpv9f";} -{name="ktp-auth-handler";key="auth_handler";sha256="1fggj8aa56m7ycwi4q44kfzlx6gfigk0zaq8lhms4wdhm6736fhs";} -{name="ktp-common-internals";key="common_internals";sha256="196f6gkfb3w11qdbamwvkq6hxk2zbdc3js53mh352yhmdyf3cya6";} -{name="ktp-contact-applet";key="contact_applet";sha256="1vhv78qcyna1r4lmzpixb2a0p973ywjyi1izy8jf1vfhy3kk28dw";} -{name="ktp-contact-list";key="contact_list";sha256="15gnm09j4g6ip7vgisayd3ixv2sryjazakzkfksxfkdxl3mgfzg3";} -{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1mq48clrlqwbg08211pr7hm24kagjzd8zs287mk9xl2wbv70jgc1";} -{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1p47dks5cvda4i8xhij01z1qmcv2vw27az0la15rhzqlf8kh4sam";} -{name="ktp-presence-applet";key="presence_applet";sha256="1npr59g42yxb67dnplingqa2paaxdw60p99kilbvw15chfbrh47r";} -{name="ktp-send-file";key="send_file";sha256="1961zh4b1bamjyqw3wkm2aclx5sbfbr84i3x7lvfr74vw6cky8mc";} -{name="ktp-text-ui";key="text_ui";sha256="184zyw6l779nkgpc5dx9lcmh543kmr4ay8cvm8vsnrsknn6p0dgp";} -] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix new file mode 100644 index 000000000000..73eda93f7e84 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/0.3.1.nix @@ -0,0 +1,13 @@ +[ +{name="ktp-accounts-kcm";key="accounts_kcm";sha256="1lkqiwibxabg5p3k8l0zyzjyysi56dvbbcxp1sybd81hmxf6fzxh";} +{name="ktp-approver";key="approver";sha256="0bw3i8av55n93ac6phvar03b6rz34wbqrzx7l2vd48d0y5ib0j6m";} +{name="ktp-auth-handler";key="auth_handler";sha256="0kby9935df474b7jvzzg7v3zvrgml5caf96ps4dcrcvyz91ckd1y";} +{name="ktp-common-internals";key="common_internals";sha256="1g22b0g9g14dsdl0qkdglgkf26c3pjc96q19kj2kai1i644i8k5h";} +{name="ktp-contact-applet";key="contact_applet";sha256="0iwr202snsm72xjxv1jb9z24j8ikdx6ljaz5v9i0ha8f8rb1vrp5";} +{name="ktp-contact-list";key="contact_list";sha256="06y1cw2kkn6ig5qnmzl7bdz9nghpv2c83c9vf9glgbxf77qfg3ms";} +{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="1cdnl4sn34lmm7h7qv8rrkp7ia5gcg2704fqhvpv8n8gxwwhrc1a";} +{name="ktp-kded-integration-module";key="kded_integration_module";sha256="1ccihqk0pg28v2q6p9dx37ql7hnwdz2060jf1s6p9yyd27fc4is0";} +{name="ktp-presence-applet";key="presence_applet";sha256="0zgl8z81kmy2a03kzgvvqlr244cw9gw2kfrph1d6ax8zk4fqvxnz";} +{name="ktp-send-file";key="send_file";sha256="1d1j0klp8dvmldn5c19zqfsxcm5hbaq5fxikpjg0q3j9ib8yh9la";} +{name="ktp-text-ui";key="text_ui";sha256="0qikjh8ywlnwkfr4nd4hc9b15b824simhdj3n62yd87pmkk3avw6";} +] diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch b/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch deleted file mode 100644 index 6b73781af5ce..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/contact-applet-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit eaf09e1242408ac8652ba3ffd1d698326e4b2360 -Author: Rohan Garg -Date: Wed Feb 8 00:19:19 2012 +0530 - - Do not use CMake 2.8 just yet - - CMake 2.8 has some scope issues which cause the pofile target to - interfere while building translations in the tarball releases. - Not requiring CMake 2.8 fixes the build issue. - - BUGS: 292593 293030 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b34038..50e94f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,5 @@ - project(ktp-contact-applet) - --cmake_minimum_required(VERSION 2.8) -- - set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ${CMAKE_MODULE_PATH} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 3a7f2d32463d..0bced075b882 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -2,12 +2,9 @@ , qt_gstreamer }: let - version = "0.3.0"; + version = "0.3.1"; manifest = import (./. + "/${version}.nix"); - overrides = { - presence_applet = x : (x // { patches = [ ./presence-applet-po.patch ]; }); - contact_applet = x: (x // { patches = [ ./contact-applet-po.patch ]; }); - }; + overrides = { }; ktpFun = { name, key, sha256 }: { name = key; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch b/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch deleted file mode 100644 index 10d190a62945..000000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/presence-applet-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit bf59d0488708eb57ca91a9b6d0ce8951b99ba778 -Author: Rohan Garg -Date: Wed Feb 8 01:19:42 2012 +0530 - - Do not use CMake 2.8 just yet - - CMake 2.8 has some scope issues which cause the pofile target to - interfere while building translations in the tarball releases. - Not requiring CMake 2.8 fixes the build issue. - - BUG: 292593 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8e2c1de..80add26 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,5 @@ - project(ktp-presence-applet) - --cmake_minimum_required(VERSION 2.8) -- - set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ${CMAKE_MODULE_PATH}