diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/inputmethods')
7 files changed, 9 insertions, 47 deletions
diff --git a/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock index 1ca313c6cd54..86cbfcfc5d88 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - fusuma (1.3.0) + fusuma (3.1.0) PLATFORMS ruby diff --git a/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix b/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix index 87e0ae14da8c..bcb624aa5841 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fusuma/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150jc8jyqj3w4k13lf1ihqmm2sld1yawp4jwnf43jixnc9rmzx6f"; + sha256 = "163an1yv8lasbdmdjsj2a4byq1rljg7vf5z86ip33xpb9l133xmm"; type = "gem"; }; - version = "1.3.0"; + version = "3.1.0"; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/hime/default.nix b/nixpkgs/pkgs/tools/inputmethods/hime/default.nix index 4c86fb04cf04..685ac169e065 100644 --- a/nixpkgs/pkgs/tools/inputmethods/hime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/hime/default.nix @@ -4,7 +4,6 @@ , which , gtk2 , gtk3 -, qt4 , qt5 , libXtst , lib @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which pkg-config unixtools.whereis ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ]; + buildInputs = [ libXtst gtk2 gtk3 qt5.qtbase libchewing anthy ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 22294b19820a..0ce6215b4964 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.23.4"; + version = "2.24.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-QVOcIpqdMTGQgqhBBbkA1UKyVKNGqkWzOVCVSLC5ecA="; + hash = "sha256-C9RUkA/gb3jhRGfYXX6rzCnYenSkAVdNvR1+O0u9Av8="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix deleted file mode 100644 index c119b1d35595..000000000000 --- a/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, ibus, cmake, pkg-config, qt4, icu, doxygen }: - -stdenv.mkDerivation rec { - pname = "ibus-qt"; - version = "1.3.4"; - - src = fetchurl { - url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${pname}-${version}-Source.tar.gz"; - sha256 = "sha256-HnsMy4i8NscCVFF28IcOZ2BoXozZfZzXk4CE9c7bL/E="; - }; - - nativeBuildInputs = [ cmake pkg-config doxygen ]; - buildInputs = [ ibus qt4 icu ]; - - cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; - - meta = with lib; { - homepage = "https://github.com/ibus/ibus-qt/"; - description = "Qt4 interface to the ibus input method"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ gebner ]; - }; -} diff --git a/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix b/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix index 198b1f8f9913..a0c92765c163 100644 --- a/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/keymapper/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-45/Y+uFmdjTdZuAX5we5QrcKH/PjC5fvXiNqJscyTGY="; + hash = "sha256-c0AiXr0dqlCNRlZxaEU9Tv7ZwPKajxY+eiI1zCb3hKs="; }; # all the following must be in nativeBuildInputs diff --git a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix index 4e52e6056867..70d3e8e8725c 100644 --- a/nixpkgs/pkgs/tools/inputmethods/uim/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/uim/default.nix @@ -7,8 +7,7 @@ , withGtk2 ? withGtk, gtk2 ? null , withGtk3 ? withGtk, gtk3 ? null , withQt ? true -, withQt4 ? withQt, qt4 ? null -, withQt5 ? false, qt5 ? null +, withQt5 ? withQt, qt5 ? null , withLibnotify ? true, libnotify ? null , withSqlite ? true, sqlite ? null , withNetworking ? true, curl ? null, openssl ? null @@ -21,13 +20,6 @@ assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; -# TODO(@oxij): ./configure can't find both qmakes at the same time -# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation -assert withQt4 -> !withQt5 && qt4 != null; -assert withQt5 -> !withQt4 && qt5 != null; - -assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory" - assert withAnthy -> anthy != null; assert withLibnotify -> libnotify != null; assert withSqlite -> sqlite != null; @@ -60,7 +52,6 @@ stdenv.mkDerivation rec { ++ lib.optional withAnthy anthy ++ lib.optional withGtk2 gtk2 ++ lib.optional withGtk3 gtk3 - ++ lib.optional withQt4 qt4 ++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] ++ lib.optional withLibnotify libnotify ++ lib.optional withSqlite sqlite @@ -114,10 +105,6 @@ stdenv.mkDerivation rec { ++ lib.optional withAnthy "--with-anthy-utf8" ++ lib.optional withGtk2 "--with-gtk2" ++ lib.optional withGtk3 "--with-gtk3" - ++ lib.optionals withQt4 [ - "--with-qt4" - "--with-qt4-immodule" - ] ++ lib.optionals withQt5 [ "--with-qt5" "--with-qt5-immodule" |