diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/inputmethods')
22 files changed, 364 insertions, 55 deletions
diff --git a/nixpkgs/pkgs/tools/inputmethods/emote/default.nix b/nixpkgs/pkgs/tools/inputmethods/emote/default.nix index 79831d7ef1ec..b2c0fe6cc61c 100644 --- a/nixpkgs/pkgs/tools/inputmethods/emote/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/emote/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { description = "A modern emoji picker for Linux"; homepage = "https://github.com/tom-james-watson/emote"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 2767b4c7c0ef..422b1148d05b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fcitx-libpinyin"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-libpinyin/${pname}-${version}.tar.xz"; - sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6"; + sha256 = "1wvsc21imbgq3chlxfw4aycmkb2vi1bkjj9frvhga2m5b5pq82k5"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix index bae542cefbae..f00da6045a3c 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.11"; + version = "5.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-81FuV6wBDQcOG5TLEJBqSG09BRgLekAo3tqZA40AQYo="; + sha256 = "sha256-Trpye+jTu+l8ieUK6IX+ZqNe4H2DvoJ10juiMkEGRKM="; }; prePatch = '' diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix new file mode 100644 index 000000000000..7d3ef954b272 --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, libchewing +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-chewing"; + version = "5.0.9"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "sha256-wPfod0BNvNy1gwSJyu7N0sS61StnmXLrMNFgmHk9A0M="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + ]; + + buildInputs = [ + fcitx5 + libchewing + ]; + + meta = with lib; { + description = "Chewing wrapper for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-chewing"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index b52d03b7743f..7f75748df57b 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.9"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-chinese-addons"; + repo = pname; rev = version; - sha256 = "sha256-GnFIbvbLkL8YkLA3ziS8gBia9juDOkQWRcrXIPJAjLc="; + sha256 = "sha256-PBKTc6yxCaLYZxfR7158rTkR7GsDCapjCKBuLxNu4dU="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 7a7801b35270..42a7ffd0100e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.9"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-QPRaATx6TaysfZrFCR/Itc+4hx3sx7kLbahacQGrccE="; + sha256 = "sha256-8Yj4ueLyfPlvjI3HLH5qudY5BEQaBkM5rNgqjH1ihV8="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 43224553753d..eaec4463ca59 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.10"; + version = "5.0.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-QR2ZHP6dP7XcOCJw2BE1ak+mnRL0njV2T1+iBeMA+do="; + sha256 = "sha256-wSYYVQMuydtxMQ/v9b6bBMesyfKlsqUqpqf/y74Q4zc="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix new file mode 100644 index 000000000000..2357c73b764c --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, gettext +, fcitx5 +, libhangul +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-hangul"; + version = "5.0.7"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "sha256-vjKQ0h85gvlE+inHuzkIBLgluwA6c/XADtyMi6nQNc8="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + gettext + ]; + + buildInputs = [ + fcitx5 + libhangul + ]; + + meta = with lib; { + description = "Hangul wrapper for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-hangul"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 879e6ffa78fa..8f53508a0433 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-lua"; + repo = pname; rev = version; - sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc"; + sha256 = "sha256-6znDtU/yVAJByhCanW7KVg5Tk615aCLbFbxDMESVOlY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix index a8a1cd0eb7a3..ab2219bfb9a8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-m17n"; - version = "5.0.6"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-w806Xy7S8rhw7ZtMRzHfUD9BDzj3VmCxlP+kHMZgFpc="; + sha256 = "sha256-Mh3a7PzfNmGGXzKb/6QUgLmRw7snsM3WSOduFdxj6OM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 15b6f51126d9..24e06028a45a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.8"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-qt"; + repo = pname; rev = version; - sha256 = "sha256-S7hbcAyoS+gagqoL+C3YgcyjODnE+ZvHEFIoAqAmOxo="; + sha256 = "sha256-KSnbwXMyAnya0Os/xrmjzK/wD6/dpM48rs1nS9SL5hs="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index f25a41306365..ecbe4d5c67b4 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -6,22 +6,21 @@ , gettext , fcitx5 , librime -, brise }: stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.9"; + version = "5.0.11"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-DRT4e59sMgS1xOIVx4t8I4aJGPprvRS6CYcNssIU2iY="; + sha256 = "sha256-kEqooOSLMp2LF911M1q67GYRGx421V6iExXOQk1pcl0="; }; cmakeFlags = [ - "-DRIME_DATA_DIR=${brise}/share/rime-data" + "-DRIME_DATA_DIR=${placeholder "out"}/share/rime-data" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 65ad408adeba..fd91a9bafb4a 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-K+MeFfst+vxgaHkYgLzfj7wqHYP6dIbh5ZOYHaV0cXo="; + sha256 = "sha256-8ad7A6MHkVfQEVMrbuAv2sJlc7t3rlz4EFqaMe51YSw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b6ba9bfd1632..dc601aca8060 100644 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-NePb2tDy8mSR+cPxhOF4xBnxFRjLKdNs8YNGlvfFKmg="; + sha256 = "sha256-XpQ/5OLNEcJTu1LvGBM6arGZrBl6XSIWx9MDKH9WIt4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix new file mode 100644 index 000000000000..d9517ce214d6 --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, fcitx5-qt +, gettext +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "fcitx5-unikey"; + version = "5.0.8"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-unikey"; + rev = version; + sha256 = "sha256-UdhTIVRLEqzxh9aafqwLhA8EOKiO/tD5QksdVd0rvqI="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + + buildInputs = [ fcitx5 fcitx5-qt gettext ]; + + meta = with lib; { + description = "Unikey engine support for Fcitx5"; + homepage = "https://github.com/fcitx/fcitx5-unikey"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ berberman ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py b/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py index 9f54e313fd34..205705700404 100755 --- a/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/update.py @@ -6,8 +6,24 @@ import json import requests import subprocess -REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-configtool", "fcitx5-lua", - "fcitx5-rime", "fcitx5-chinese-addons", "fcitx5-table-extra", "fcitx5-table-other" ] +REPOS = [ + "libime", + "xcb-imdkit", + + "fcitx5", + "fcitx5-chewing", + "fcitx5-chinese-addons", + "fcitx5-configtool", + "fcitx5-gtk", + "fcitx5-hangul", + "fcitx5-lua", + "fcitx5-m17n", + "fcitx5-qt", + "fcitx5-rime", + "fcitx5-table-extra", + "fcitx5-table-other", + "fcitx5-unikey" + ] OWNER = "fcitx" diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index b5a10a83d860..a81602b3cfee 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , gettext @@ -11,6 +12,10 @@ , glib , gtk3 , python3 +, lua +, opencc +, libsoup +, json-glib }: stdenv.mkDerivation rec { @@ -31,6 +36,11 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + configureFlags = [ + "--enable-cloud-input-mode" + "--enable-opencc" + ]; + buildInputs = [ ibus glib @@ -42,6 +52,10 @@ stdenv.mkDerivation rec { ])) gtk3 db + lua + opencc + libsoup + json-glib ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 410774e3897b..9712b56b01e1 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.14.1"; + version = "1.16.7"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-PO5OOIOyolx6PRQ36u0s+oz3elgZzGBZGgOLTxGWbGo="; + sha256 = "sha256-rejYxuRhzNmtx11NH3BZe3ODjU5OyZ9sgk6GWnBBXAo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix b/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix new file mode 100644 index 000000000000..82664c3700e2 --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix @@ -0,0 +1,157 @@ +{ lib +, python3 +, pkgconfig +, wrapGAppsHook +, gettext +, gtk3 +, glib +, dbus +, gobject-introspection +, xmodmap +, pygobject3 +, setuptools +, evdev +, pydantic +, pydbus +, psutil +, fetchFromGitHub +, buildPythonApplication +, procps +, gtksourceview4 + # Change the default log level to debug for easier debugging of package issues +, withDebugLogLevel ? false + # Xmodmap is an optional dependency + # If you use Xmodmap to set keyboard mappings (or your DE does) + # it is required to correctly map keys +, withXmodmap ? true + # Version and rev and hash are package arguments to allow overriding + # while ensuring the values in prePatch and src match + # https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 + # The names are prefixed with input_remapper to avoid potential + # collisions with package names +, input_remapper_version ? "unstable-2022-02-09" +, input_remapper_src_rev ? "55227e0b5a28d21d7333c6c8ea1c691e56fd35c4" +, input_remapper_src_hash ? "sha256-kzGlEaYN/JfAgbI0aMLr5mwObYOL43X7QU/ihDEBQFg=" +}: + +let + maybeXmodmap = lib.optional withXmodmap xmodmap; +in +buildPythonApplication { + pname = "input-remapper"; + version = input_remapper_version; + + src = fetchFromGitHub { + rev = input_remapper_src_rev; + owner = "sezanzeb"; + repo = "input-remapper"; + hash = input_remapper_src_hash; + }; + + # Fixes error + # Couldn’t recognize the image file format for file "*.svg" + # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + prePatch = '' + # set revision for --version output + echo "COMMIT_HASH = '${input_remapper_src_rev}'" > inputremapper/commit_hash.py + + # fix FHS paths + substituteInPlace inputremapper/configs/data.py \ + --replace "/usr/share/input-remapper" "$out/usr/share/input-remapper" + '' + (lib.optionalString (withDebugLogLevel) '' + # if debugging + substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" + ''); + + doCheck = true; + checkInputs = [ + psutil + ]; + pythonImportsCheck = [ + "evdev" + "inputremapper" + ]; + + # Custom test script, can't use plain pytest / pytestCheckHook + # We only run tests in the unit folder, integration tests require UI + # To allow tests which access the system and session DBUS to run, we start a dbus session + # and bind it to both the system and session buses + installCheckPhase = '' + echo "<busconfig> + <type>session</type> + <listen>unix:tmpdir=$TMPDIR</listen> + <listen>unix:path=/build/system_bus_socket</listen> + <standard_session_servicedirs/> + <policy context=\"default\"> + <!-- Allow everything to be sent --> + <allow send_destination=\"*\" eavesdrop=\"true\"/> + <!-- Allow everything to be received --> + <allow eavesdrop=\"true\"/> + <!-- Allow anyone to own anything --> + <allow own=\"*\"/> + </policy> + </busconfig>" > dbus.cfg + PATH=${lib.makeBinPath ([ dbus procps ] ++ maybeXmodmap)}:$PATH \ + USER="$(id -u -n)" \ + DBUS_SYSTEM_BUS_ADDRESS=unix:path=/build/system_bus_socket \ + ${dbus}/bin/dbus-run-session --config-file dbus.cfg \ + python tests/test.py --start-dir unit + ''; + + # Nixpkgs 15.9.4.3. When using wrapGAppsHook with special derivers you can end up with double wrapped binaries. + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : "${lib.makeBinPath maybeXmodmap}" + ) + ''; + + nativeBuildInputs = [ + wrapGAppsHook + gettext # needed to build translations + gtk3 + glib + gobject-introspection + pygobject3 + ] ++ maybeXmodmap; + + propagatedBuildInputs = [ + setuptools # needs pkg_resources + pygobject3 + evdev + pkgconfig + pydantic + pydbus + gtksourceview4 + ]; + + postInstall = '' + sed -r "s#RUN\+\=\"/bin/input-remapper-control#RUN\+\=\"$out/bin/input-remapper-control#g" -i data/99-input-remapper.rules + sed -r "s#ExecStart\=/usr/bin/input-remapper-service#ExecStart\=$out/bin/input-remapper-service#g" -i data/input-remapper.service + + chmod +x data/*.desktop + + install -D -t $out/share/applications/ data/*.desktop + install -D -t $out/share/polkit-1/actions/ data/input-remapper.policy + install -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules + install -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service + install -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy + install -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf + install -D -t $out/usr/share/input-remapper/ data/* + + # Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones + install -m755 -D -t $out/bin/ bin/input-remapper* + ''; + + meta = with lib; { + description = "An easy to use tool to change the mapping of your input device buttons"; + homepage = "https://github.com/sezanzeb/input-remapper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ LunNova ]; + mainProgram = "input-remapper-gtk"; + }; +} diff --git a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 6cac37da7db2..68a91d2bfca7 100644 --- a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; + sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; + sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; }; # Replace autostart path diff --git a/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index 6606f1f0011f..0028fa6b7b23 100644 --- a/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "remote-touchpad"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "unrud"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VgTjQXjJn17+BhREew62RTjNo8UWc4Fn9x+924nGD+I="; + sha256 = "sha256-XyE8N+YVwfgxToKkhpe8zJ0e3HFDpKt7cfERxWCfbfU="; }; buildInputs = [ libX11 libXi libXt libXtst ]; tags = [ "portal,x11" ]; - vendorSha256 = "sha256-Cw4uMnID0nDhSl+ijHMo1VcXLdY1bHFpEkqDQDJOJOw="; + vendorSha256 = "sha256-zTx38kW/ylXXML73C2sFQciV2y3+qbO0S/ZdkiEh5Qs="; meta = with lib; { description = "Control mouse and keyboard from the webbrowser of a smartphone."; diff --git a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index a50770c73559..c78890772717 100644 --- a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,6 +1,8 @@ -{ stdenv, lib +{ stdenv +, lib , fetchFromGitHub , fetchpatch +, nix-update-script , systemd , libinput , pugixml @@ -16,15 +18,28 @@ stdenv.mkDerivation rec { pname = "touchegg"; - version = "2.0.12"; + version = "2.0.13"; + src = fetchFromGitHub { owner = "JoseExposito"; repo = pname; rev = version; - sha256 = "sha256-oJzehs7oLFTDn7GSm6bY/77tEfyEdlANn69EdCApdPA="; + sha256 = "sha256-wfXA4+HSLFHMvdsnyiTfRxPqdSsvd0RMkKIacf+rLZI="; }; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + patches = lib.optionals withPantheon [ + # Disable per-application gesture by default to make sure the default + # config does not conflict with Pantheon switchboard settings. + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/7d9b133e02132d7f13cf2fe850b2fe4c015c3c5e.patch"; + sha256 = "sha256-ZOGVkxiXoTORXC6doz5r9IObAbYjhsDjgg3HtzlTSUc="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + cmake + ]; buildInputs = [ systemd @@ -43,19 +58,13 @@ stdenv.mkDerivation rec { libxcb ]); - nativeBuildInputs = [ - pkg-config - cmake - ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - patches = lib.optionals withPantheon [ - # Disable per-application gesture by default to make sure the default - # config does not conflict with Pantheon switchboard settings. - (fetchpatch { - url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; - sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4"; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with lib; { homepage = "https://github.com/JoseExposito/touchegg"; |