Bump ibus, ibus-anthy, and ibus-qt to their latest versions.

3 files changed, 16 insertions, 16 deletions

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix
index df0790877ac..1b0201c4b17 100644
--- a/pkgs/tools/inputmethods/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }:
 
-let version = "1.5.4";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
+  version = "1.5.6";
 
   meta = with stdenv.lib; {
     description = "IBus interface to the anthy input method";
-    homepace    = https://code.google.com/p/ibus/;
+    homepage    = http://wiki.github.com/fujiwarat/ibus-anthy;
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ gebner ];
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz";
-    sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031";
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix
index c538d36ec59..95c32532e40 100644
--- a/pkgs/tools/inputmethods/ibus-qt/default.nix
+++ b/pkgs/tools/inputmethods/ibus-qt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-qt-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
-    url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz";
-    sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76";
+    url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz";
+    sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g";
   };
 
   buildInputs = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ];
 
   meta = with stdenv.lib; {
-    homepage    = https://code.google.com/p/ibus/;
+    homepage    = https://github.com/ibus/ibus-qt/;
     description = "Qt4 interface to the ibus input method";
     platforms   = platforms.linux;
     license     = licenses.gpl2Plus;
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 6b426169a70..97a8c3e7d1c 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-${version}";
-  version = "1.5.5";
+  version = "1.5.10";
 
   src = fetchurl {
-    url = "http://ibus.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
+    url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";
+    sha256 = "152mdzi9hr246spnn7bkb4gy16x30082xwq460gmm1q2cs0bf08x";
   };
 
   configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     libnotify isocodes gobjectIntrospection
   ];
 
-  preBuild = ''
-    patchShebangs ./scripts
-    substituteInPlace data/dconf/Makefile --replace "dconf update" "echo"
+  preConfigure = ''
+    substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
+    sed -i "s|PYTHON2_LIBDIR=.*|PYTHON2_LIBDIR=$out/lib/${python.libPrefix}|" configure
   '';
 
   preFixup = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://code.google.com/p/ibus/;
+    homepage = https://github.com/ibus/ibus;
     description = "Intelligent Input Bus for Linux / Unix OS";
     platforms = stdenv.lib.platforms.linux;
   };