From 2eaf5da7fb8a4f493f7d7db5dc73dd4b2c5bb0f1 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 22 Feb 2025 11:44:40 +0800 Subject: [PATCH 1/2] ibus-engines.table-chinese: remove with lib --- .../ibus-engines/ibus-table-chinese/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index e829835af7e8..46a76d88eebd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { src cmakeFedoraSrc ]; + sourceRoot = src.name; postUnpack = '' @@ -73,18 +74,19 @@ stdenv.mkDerivation { cmake pkg-config ]; + buildInputs = [ ibus ibus-table python3 ]; - meta = with lib; { + meta = { isIbusEngine = true; description = "Chinese tables for IBus-Table"; homepage = "https://github.com/definite/ibus-table-chinese"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ pneumaticat ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ pneumaticat ]; }; } From 672baebe65cab8abf00d4bb814fbc8c6d31a02d3 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 22 Feb 2025 11:49:24 +0800 Subject: [PATCH 2/2] ibus-engines.table-chinese: 1.8.2 -> 1.8.3 --- .../ibus-engines/ibus-table-chinese/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index 46a76d88eebd..23341215e279 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -14,19 +14,19 @@ let src = fetchFromGitHub { owner = "definite"; repo = "ibus-table-chinese"; - rev = "f1f6a3384f021caa3b84c517e2495086f9c34507"; - sha256 = "14wpw3pvyrrqvg7al37jk2dxqfj9r4zf88j8k2n2lmdc50f3xs7k"; + rev = "3380c96b5230721e9b80685a719508c505b8137a"; + hash = "sha256-Ymzkim1k6KQxcSX2LaczRsxV2DYCFxIWI5xulmhOrw8="; }; cmakeFedoraSrc = fetchgit { url = "https://pagure.io/cmake-fedora.git"; rev = "7d5297759aef4cd086bdfa30cf6d4b2ad9446992"; - sha256 = "0mx9jvxpiva9v2ffaqlyny48iqr073h84yw8ln43z2avv11ipr7n"; + hash = "sha256-9uQbQ9hbiT+IpYh7guA4IOOIiLeeYuWc2EntePuWqVc="; }; in stdenv.mkDerivation { pname = "ibus-table-chinese"; - version = "1.8.2"; + version = "1.8.3"; srcs = [ src