fctix5 packages and module update (#417815)

Nick Cao 1b7a161d c8ea2785

+2
nixos/doc/manual/release-notes/rl-2511.section.md
···
- `renovate` was updated to v41. See the upstream release notes for [v40](https://github.com/renovatebot/renovate/releases/tag/40.0.0) and [v41](https://github.com/renovatebot/renovate/releases/tag/41.0.0) for breaking changes.
+
- `i18n.inputMethod.fcitx5.plasma6Support` has been removed because qt6 is the only one used for fcitx5-configtool now.
+
- The `boot.readOnlyNixStore` has been removed. Control over bind mount options on `/nix/store` is now offered by the `boot.nixStoreMountOpts` option.
- The Postfix module has been updated and likely requires configuration changes:
+4 -14
nixos/modules/i18n/input-method/fcitx5.nix
···
let
imcfg = config.i18n.inputMethod;
cfg = imcfg.fcitx5;
-
fcitx5Package =
-
if cfg.plasma6Support then
-
pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; }
-
else
-
pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
+
fcitx5Package = pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; };
settingsFormat = pkgs.formats.ini { };
in
{
···
description = ''
Use the Wayland input method frontend.
See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland).
-
'';
-
};
-
plasma6Support = lib.mkOption {
-
type = lib.types.bool;
-
default = config.services.desktopManager.plasma6.enable;
-
defaultText = lib.literalExpression "config.services.desktopManager.plasma6.enable";
-
description = ''
-
Use qt6 versions of fcitx5 packages.
-
Required for configuring fcitx5 in KDE System Settings.
'';
};
quickPhrase = lib.mkOption {
···
imports = [
(lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "enableRimeData" ] ''
RIME data is now included in `fcitx5-rime` by default, and can be customized using `fcitx5-rime.override { rimeDataPkgs = ...; }`
+
'')
+
(lib.mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx5" "plasma6Support" ] ''
+
qt6 is the only one used for fcitx5-configtool now.
'')
];
+4 -4
pkgs/by-name/li/libime/package.nix
···
url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst";
hash = "sha256-7oPs8g1S6LzNukz2zVcYPVPCV3E6Xrd+46Y9UPw3lt0=";
};
-
dictVer = "20241001";
+
dictVer = "20250327";
dict = fetchurl {
url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst";
-
hash = "sha256-0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8=";
+
hash = "sha256-fKa+R1TA1MJ7p3AsDc5lFlm9LKH6pcvyhI2BoAU8jBM=";
};
in
stdenv.mkDerivation rec {
pname = "libime";
-
version = "1.1.10";
+
version = "1.1.11";
src = fetchFromGitHub {
owner = "fcitx";
repo = "libime";
tag = version;
-
hash = "sha256-liVJEBUYcVYjjJCMW68xXbEHKQpAgTLCPm2yIdWG3IQ=";
+
hash = "sha256-C9l7VBSUdSpnt+8ghdmLljZXHFswTyi/ItqeeYTjF4Y=";
fetchSubmodules = true;
};
-1
pkgs/by-name/wp/wpsoffice-cn/package.nix
···
libmysqlclient
llvmPackages.openmp
dbus
-
libsForQt5.fcitx5-qt
];
dontWrapQtApps = true;
+2 -4
pkgs/tools/inputmethods/fcitx5/default.nix
···
pango,
expat,
fribidi,
-
fmt,
wayland,
systemd,
wayland-protocols,
···
in
stdenv.mkDerivation rec {
pname = "fcitx5";
-
version = "5.1.12";
+
version = "5.1.14";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-Jk7YY6nrY1Yn9KeNlRJbMF/fCMIlUVg/Elt7SymlK84=";
+
hash = "sha256-wLJZyoWjf02+m8Kw+IcfbZY2NnjMGtCWur2+w141eS4=";
};
prePatch = ''
···
buildInputs = [
expat
-
fmt
isocodes
cairo
enchant
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-anthy";
-
version = "5.1.6";
+
version = "5.1.7";
src = fetchurl {
url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
-
hash = "sha256-XIgzYHiSE/PHNGUt68IZXKahPwYOZ3O0bq/KO1MrnCI=";
+
hash = "sha256-lY5GFbeIee7u1NsLbkYt6BvST9lidvZLpaylL0wE2+0=";
};
nativeBuildInputs = [
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-chewing";
-
version = "5.1.7";
+
version = "5.1.8";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-QL1rRMsaDP98as0zlmoDPoVnbqbKQFoUFSCX+j31JcM=";
+
hash = "sha256-On8lbZL7hyY399a/q6iCNkDvRljv3zirzEO1wIG+MNE=";
};
nativeBuildInputs = [
+5 -8
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
···
}:
let
-
pyStrokeVer = "20121124";
+
pyStrokeVer = "20250329";
pyStroke = fetchurl {
url = "http://download.fcitx-im.org/data/py_stroke-${pyStrokeVer}.tar.gz";
-
hash = "sha256-jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=";
+
hash = "sha256-wafKciXTYUq4M1P8gnUDAGqYBEd2IBj1N2BCXXtTA6Y=";
};
pyTableVer = "20121124";
pyTable = fetchurl {
···
stdenv.mkDerivation rec {
pname = "fcitx5-chinese-addons";
-
version = "5.1.8";
+
version = "5.1.9";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-QO136EbUFxT7yA1Fs4DvV0CKpdCMw/s5s9sW3vRzGD8=";
+
hash = "sha256-xHLd7X9IdYTsVyqbghVzdC2i9AVipFHKRxP2Zqq7zGw=";
};
nativeBuildInputs = [
···
opencc
qtwebengine
fmt
+
qtbase
]
++ lib.optional luaSupport fcitx5-lua;
-
-
cmakeFlags = [
-
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
-
];
dontWrapQtApps = true;
+2 -3
pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-configtool";
-
version = "5.1.9";
+
version = "5.1.10";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-x4DhPxiwPR16xQpBFnJ1DiU435BHOOs6pFj+zJQXFUI=";
+
hash = "sha256-Py2UDBQRqvT7kwZeQIXKrIjGAbOjjxEyEfO5tdtizW4=";
};
cmakeFlags = [
(lib.cmakeBool "KDE_INSTALL_USE_QT_SYS_PATHS" true)
(lib.cmakeBool "ENABLE_KCM" kcmSupport)
-
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
];
nativeBuildInputs = [
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-hangul";
-
version = "5.1.6";
+
version = "5.1.7";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-WTTMW86KsrncfDHttri2eSA0bp/Vm4QVyl9tWkJn00E=";
+
hash = "sha256-66VW/hzKMVwXd7ktPQHrVbsWazKedS+/giTLIh5fkwo=";
};
nativeBuildInputs = [
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix
···
}:
stdenv.mkDerivation rec {
pname = "fcitx5-lua";
-
version = "5.0.14";
+
version = "5.0.15";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-7FBUOsaKr9cuEaqd4dqnAGL5sd3RF+qV6GEkOUQ1/k4=";
+
hash = "sha256-BhsckLi6FSrRw+QZ8pTEgjV4BaTKSKAJtmcRCFoOUwU=";
};
nativeBuildInputs = [
+2 -4
pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
···
m17n_lib,
m17n_db,
gettext,
-
fmt,
nixosTests,
}:
stdenv.mkDerivation rec {
pname = "fcitx5-m17n";
-
version = "5.1.3";
+
version = "5.1.4";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-kHMCMsJ8+rI0AtS9zEE5knGvKALhgfmgS8lC/CTmYs0=";
+
hash = "sha256-TJMJGjO9V6EOzxt6Z7rwOfIQWK38XolDhUKbjbNUGhA=";
};
nativeBuildInputs = [
···
fcitx5
m17n_db
m17n_lib
-
fmt
];
passthru.tests = {
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
···
in
stdenv.mkDerivation rec {
pname = "fcitx5-qt${majorVersion}";
-
version = "5.1.9";
+
version = "5.1.10";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-qt";
rev = version;
-
hash = "sha256-cOCLPsWRcwukGCKAYHrZSRUYlmfYxdyspX5Y0rqbD2w=";
+
hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4=";
};
postPatch = ''
+2 -2
pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
-
version = "5.1.10";
+
version = "5.1.11";
src = fetchurl {
url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst";
-
hash = "sha256-ACW79fLgrS+Qv8YJjGr4WldTJsnnGhC0WWf8ia9khYk=";
+
hash = "sha256-cc/B99tdVVWnvdl7dYYQlIvk8F2xXUOr6sF36yxQZfY=";
};
cmakeFlags = [
+2 -3
pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-skk";
-
version = "5.1.6";
+
version = "5.1.7";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
-
hash = "sha256-1gfR0wXBXM6Gttwldg2vm8DUUW4OciqKMQkpFQHqLoE=";
+
hash = "sha256-WMkcZSocanhWMn9kiWyB07jEW4x84G07kAYvn5heenc=";
};
nativeBuildInputs = [
···
cmakeFlags = [
(lib.cmakeBool "ENABLE_QT" enableQt)
-
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
"-DSKK_DEFAULT_PATH=${skkDictionaries.l}/share/skk/SKK-JISYO.L"
];
+2 -6
pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
···
stdenv.mkDerivation rec {
pname = "fcitx5-unikey";
-
version = "5.1.6";
+
version = "5.1.7";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-unikey";
rev = version;
-
hash = "sha256-hx3GXoloO3eQP9yhLY8v1ahwvOTCe5XcBey+ZbReRjE=";
+
hash = "sha256-ve+vu/bK3GYgjn9KxuOsFZFi9eymi1TFlzUHu4fJAkk=";
};
nativeBuildInputs = [
···
qtbase
fcitx5
fcitx5-qt
-
];
-
-
cmakeFlags = [
-
(lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6"))
];
dontWrapQtApps = true;
+1 -1
pkgs/tools/inputmethods/fcitx5/update.py
···
for repo in REPOS:
rev = get_latest_tag(repo)
if repo == "fcitx5-qt":
-
subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)])
+
subprocess.run(["nix-update", "--commit", "--version", rev, "qt6Packages.{}".format(repo)])
else:
subprocess.run(["nix-update", "--commit", "--version", rev, repo])
+5 -5
pkgs/top-level/aliases.nix
···
futuresql = libsForQt5.futuresql; # added 2023-11-11
fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
-
fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01
-
fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01
-
fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01
-
fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01
-
fcitx5-with-addons = libsForQt5.fcitx5-with-addons; # Added 2024-03-01
+
fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
+
fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
+
fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
+
fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
+
fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
### G ###
-10
pkgs/top-level/qt5-packages.nix
···
fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { };
-
fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { };
-
-
fcitx5-configtool = callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { };
-
-
fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; };
-
-
fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { };
-
-
fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { };
-
futuresql = callPackage ../development/libraries/futuresql { };
qgpgme = callPackage ../development/libraries/gpgme { };