From c5522d25d537ea87c3f148b3e81596dd4833ffad Mon Sep 17 00:00:00 2001 From: Nguyen Hong Hiep Date: Fri, 11 Sep 2026 19:05:09 +0700 Subject: [PATCH] fcitx5-lotus: 3.5.7 -> 3.5.9 --- pkgs/by-name/fc/fcitx5-lotus/package.nix | 31 ++++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/fc/fcitx5-lotus/package.nix b/pkgs/by-name/fc/fcitx5-lotus/package.nix index 405b2d985730..3bdec1647191 100644 --- a/pkgs/by-name/fc/fcitx5-lotus/package.nix +++ b/pkgs/by-name/fc/fcitx5-lotus/package.nix @@ -31,16 +31,30 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-lotus"; - version = "3.5.7"; + version = "3.5.9"; src = fetchFromGitHub { owner = "LotusInputMethod"; repo = "fcitx5-lotus"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IQFklfLrccVm/SW8dpcplbWfoYJNoS4nMMdkuOzOgdo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-kOIs8nLSF93xDIU7v8Wldyw+Zs5NEMJqZA/42TN4oYM="; fetchSubmodules = true; }; + vendorDir = finalAttrs.passthru."go-modules"; + + passthru = { + "go-modules" = + (buildGoModule { + pname = "fcitx5-lotus-go-modules"; + inherit (finalAttrs) version src; + modRoot = "bamboo"; + vendorHash = "sha256-CNDYjxDfqh9nGs5vlpb/7qXZeNtkvegC5nPvBOZcDrc="; + }).goModules; + + updateScript = nix-update-script { }; + }; + nativeBuildInputs = [ cmake gettext @@ -65,18 +79,11 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + __structuredAttrs = true; dontWrapQtApps = true; - vendorDir = - (buildGoModule { - pname = "fcitx5-lotus-go-modules"; - inherit (finalAttrs) version src; - modRoot = "bamboo"; - vendorHash = "sha256-Y8sh1PqmBjXko2X9YOxwCrtrGLQ565aewrq4sRvLdpw="; - }).goModules; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go @@ -119,8 +126,6 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" ''; - passthru.updateScript = nix-update-script { }; - meta = { description = "Vietnamese input method engine for Fcitx5"; homepage = "https://github.com/LotusInputMethod/fcitx5-lotus";