Merge branch 'master' into staging-next

(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:27 +02:00
201 changed files with 2565 additions and 1560 deletions

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fcitx-anthy";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-anthy/${pname}-${version}.tar.xz";
sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd";
sha256 = "sha256-Hxhs2RXuFf/bhczcQ3+Zj+gI3+Z4BEfIzMIfUOUNX7M=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@@ -12,13 +12,13 @@
mkDerivation rec {
pname = "fcitx5-qt";
version = "5.0.4";
version = "5.0.6";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-qt";
rev = version;
sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I=";
sha256 = "sha256-Y7X4pkBSf5FMpf1mdyLvr1QWhqz3yC4iOGXDvvvV9Yw=";
};
preConfigure = ''

View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "ibus-m17n";
version = "1.4.4";
version = "1.4.5";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus-m17n";
rev = version;
sha256 = "sha256-kPTysHTC+j8BMnzsddRa4Tg54idejApTqmLrP20pu5M=";
sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg=";
};
nativeBuildInputs = [