From d738b98de2331427dfd7d929bb50fba8b8472e47 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sun, 26 Oct 2025 01:52:30 +0000 Subject: [PATCH] qt6Packages.fcitx5-qt: 5.1.10 -> 5.1.11 Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.10...5.1.11 --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 21 ++------------------ 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index efc7719e6c8b..60de5a67b019 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -10,38 +10,21 @@ qtwayland, wrapQtAppsHook, wayland, - fetchpatch2, }: let majorVersion = lib.versions.major qtbase.version; in stdenv.mkDerivation rec { pname = "fcitx5-qt${majorVersion}"; - version = "5.1.10"; + version = "5.1.11"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4="; + hash = "sha256-Nr8WnEm6z16NrXxuGEP4uQ6mxe8sUYtOxVgWMmFrWVE="; }; - patches = [ - # TODO: remove on next release - (fetchpatch2 { - url = "https://github.com/fcitx/fcitx5-qt/commit/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch?full_index=1"; - hash = "sha256-qv8Rj6YoFdMQLOB2R9LGgwCHKdhEji0Sg67W37jSIac="; - }) - (fetchpatch2 { - url = "https://github.com/fcitx/fcitx5-qt/commit/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch?full_index=1"; - hash = "sha256-x0OdlIVmwVuq2TfBlgmfwaQszXLxwRFVf+gEU224uVA="; - }) - (fetchpatch2 { - url = "https://github.com/fcitx/fcitx5-qt/commit/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch?full_index=1"; - hash = "sha256-22tKD7sbsTJcNqur9/Uf+XAvMvA7tzNQ9hUCMm+E+E0="; - }) - ]; - postPatch = '' substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \ --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix}