From 13f5c8013f62c1f4dc24221ca4b0dad7c105641a Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:13:51 +0800 Subject: [PATCH 01/13] Add an update script for fcitx packages --- pkgs/tools/inputmethods/fcitx5/default.nix | 2 ++ pkgs/tools/inputmethods/fcitx5/update.py | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 pkgs/tools/inputmethods/fcitx5/update.py diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index b3dd2260d1c..cce48914e69 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -90,6 +90,8 @@ stdenv.mkDerivation rec { libxkbfile ]; + passthru.updateScript = ./update.py; + meta = with lib; { description = "Next generation of fcitx"; homepage = "https://github.com/fcitx/fcitx5"; diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py new file mode 100755 index 00000000000..e3513c747fc --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests + +from nix_prefetch_github import * +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" ] + +OWNER = "fcitx" + +def get_latest_tag(repo, owner=OWNER): + r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) + , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265')) + return r.json()[0].get("name") + +def main(): + sources = dict() + for repo in REPOS: + rev = get_latest_tag(repo) + if repo == "fcitx5-qt": + subprocess.run(["nix-update", "--commit", "--version", rev, "libsForQt5.{}".format(repo)]) + else: + subprocess.run(["nix-update", "--commit", "--version", rev, repo]) + +if __name__ == "__main__": + main () From 63e22d6af0671d69e1887cfb6eea0ac17207b25a Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:15:39 +0800 Subject: [PATCH 02/13] libime: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/libime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 476d2419ef3..6400d8aa3a3 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "hDfxuDIj9qx5d+UFwxDdP2PCboPnUV1n+VVoEIGsucM="; + sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; fetchSubmodules = true; }; From a111fe00b9bf881a2883bd3c34e4425acd96616c Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:15:46 +0800 Subject: [PATCH 03/13] xcb-imdkit: 1.0.1 -> 1.0.2 --- pkgs/development/libraries/xcb-imdkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index 72ce94d98f1..87d562bee36 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "dvax+Wj8+tHdiL6txcuugrOlRnxdIW25DYO4iNAYK8M="; + sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; }; nativeBuildInputs = [ From c0e0b5217402a04a8e5553f8e67fca477a02ebb3 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:15:53 +0800 Subject: [PATCH 04/13] fcitx5: 5.0.3 -> 5.0.4 --- pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index cce48914e69..e578fbf1443 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5"; rev = version; - sha256 = "QYMH0WbhHqDKUvpj1VOB8U5sbBD89H6moLFkQBJijZA="; + sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg="; }; prePatch = '' From 15f2be29d6bd56333dd69c08855044eee5fe03ed Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:15:59 +0800 Subject: [PATCH 05/13] fcitx5-gtk: 5.0.1 -> 5.0.3 --- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index f153c238c53..3f42894ef9f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -24,18 +24,20 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.1"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-gtk"; rev = version; - sha256 = "rkusIqMRQMTjcpJR335as1xUQrzD9dLVB/wrLstPXPY="; + sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4="; }; cmakeFlags = [ "-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0" "-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + # disabled since we currently don't have gtk4 in nixpkgs + "-DENABLE_GTK4_IM_MODULE=off" ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ From 937ea70a98f92f4d2ac2789b7254b0c38c923c56 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:04 +0800 Subject: [PATCH 06/13] libsForQt5.fcitx5-qt: 5.0.1 -> 5.0.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e0499304889..462543d167c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM="; + sha256 = "sha256-QylvjhjiIujYGKFtL4bKVXpobkN5t6Q2MGf16dsL24A="; }; cmakeFlags = [ From eb6007055d46a616b49ed863b4fb67f05164fe56 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:10 +0800 Subject: [PATCH 07/13] fcitx5-configtool: 5.0.1 -> 5.0.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 92563e89013..ba006873c40 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -6,6 +6,7 @@ , fcitx5 , fcitx5-qt , qtx11extras +, qtquickcontrols2 , kwidgetsaddons , kdeclarative , kirigami2 @@ -18,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-configtool"; rev = version; - sha256 = "npSqd0R6bqKc+JxYCGcfVzgNLpuLtnHq6zM58smZ8/I="; + sha256 = "sha256-kw0KIbS5SVMf6kR/9xsYiChHXQBM0enSVXyh0QfiiPY="; }; cmakeFlags = [ @@ -40,6 +41,7 @@ mkDerivation rec { fcitx5 fcitx5-qt qtx11extras + qtquickcontrols2 kirigami2 isocodes xkeyboardconfig From c2de5a5f61c2dca9b43db16eac74e87e78d54318 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:15 +0800 Subject: [PATCH 08/13] fcitx5-lua: 5.0.1 -> 5.0.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 3a11e6f319d..5bf1cc76632 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; rev = "${version}"; - sha256 = "OiTk9ldqBqF7WT1KY71hacLD6OQQNO05F7+cSXlli40="; + sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE="; }; nativeBuildInputs = [ From 1d89ec0c2c6b8e6197379253a844ca976ca1cc3c Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:20 +0800 Subject: [PATCH 09/13] fcitx5-rime: 5.0.2 -> 5.0.3 --- pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index ebbee817998..7b4a0f6a013 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-rime"; rev = version; - sha256 = "cVCTsD1Iw6OtyYFpxff3ix2CubRTnDaBevAYA4I9Ai8="; + sha256 = "sha256-mPNZ/B5bpxua+E1T+oz9v2QKAzGraA2cfT8oJacC35U="; }; cmakeFlags = [ From f0766ab3aeed5775c1649c636428c19128a734c1 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:26 +0800 Subject: [PATCH 10/13] fcitx5-chinese-addons: 5.0.2 -> 5.0.3 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index b5955be3cb0..923fd7c7a74 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-chinese-addons"; rev = version; - sha256 = "11UIMrwzZqO8nrQx5oubeoQN8hspL1mvHw5Dc9sVOqQ="; + sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; }; cmakeFlags = [ From b46049c09a138a28dbd821b1419abd912c6ad050 Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:36 +0800 Subject: [PATCH 11/13] fcitx5-table-extra: 5.0.1 -> 5.0.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 3415ed40345..355ac97d8a1 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-table-extra"; rev = version; - sha256 = "UHhiWm2Khh6JBB9jz0ZKFofkAJPlqn6SqHeK9etoaxs="; + sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M="; }; nativeBuildInputs = [ From e5d652a32d4a85988270b14757fc13bdad00668b Mon Sep 17 00:00:00 2001 From: Poscat Date: Sat, 16 Jan 2021 11:16:41 +0800 Subject: [PATCH 12/13] fcitx5-table-other: 5.0.1 -> 5.0.2 --- pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index f5957135718..4feae0d4acc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-table-other"; rev = version; - sha256 = "hQlrjDPImDof2+3/uOtTdJ27cInevbxH9B+lNwquKbs="; + sha256 = "sha256-P+KaUmjAHe1CZ5rNMQAxwKSW5ZMVgQcwkgdlungXTLM="; }; nativeBuildInputs = [ From bdf7a8aa8e8df20bb88e51e5454f5f01d0098f8a Mon Sep 17 00:00:00 2001 From: Poscat Date: Fri, 22 Jan 2021 11:58:27 +0800 Subject: [PATCH 13/13] fcitx5-lua: remove unnecessary interpolation --- pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 5bf1cc76632..6184ea36549 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; - rev = "${version}"; + rev = version; sha256 = "sha256-lFlHn2q/kpq1EIKKhYVdJofXqtOHnpLz7PoWuNAhmhE="; };