Unverified Commit 2aa67ffe authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #202037 from Vonfry/update/fcitx5-5_0_15 

fcitx5: 5.0.19 -> 5.0.20 and its plugins.
parents bc47cd47 d79ab83b

pkgs/development/libraries/libime/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "libime";

  version = "1.0.14";

  version = "1.0.15";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "libime";

    rev = version;

    sha256 = "sha256-O89Op2dxuhGgCxuy2GLI0waCgDreJKNQ5tTvsx/0/fk=";

    sha256 = "sha256-QZxXhrrSkxe7bDY7V7Ns5YZaaYJiEnGmHgGLstGMBzc=";

    fetchSubmodules = true;

  };

pkgs/development/libraries/xcb-imdkit/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "xcb-imdkit";

  version = "1.0.3";

  version = "1.0.4";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "xcb-imdkit";

    rev = version;

    sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU=";

    sha256 = "sha256-WSJBEB6VHRYUkzXr7frdLLpKihuS00ZUINW7e4oYOlY=";

  };



  nativeBuildInputs = [

pkgs/tools/inputmethods/fcitx5/default.nix

+2 −6
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, cmake

, extra-cmake-modules

, cairo

, cldr-annotations

, pango

, fribidi

, fmt
@@ -41,13 +40,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "fcitx5";

  version = "5.0.19";

  version = "5.0.20";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-hgg7Sbe5/tAWWq2to9PceBQeUdV3UWENFgvuY0qCksM=";

    sha256 = "sha256-NRJbRjD5M2eq2YYEoJNjnn5XVSBGqIjO0cA9YCrfyhA=";

  };



  prePatch = ''
@@ -73,7 +72,6 @@ stdenv.mkDerivation rec { 
    gdk-pixbuf

    wayland

    wayland-protocols

    cldr-annotations

    json_c

    libGL

    libevent
@@ -90,8 +88,6 @@ stdenv.mkDerivation rec { 
    libxkbfile

  ];



  cmakeFlags = [ "-DCLDR_DIR=${cldr-annotations}/share/unicode/cldr" ];



  passthru.updateScript = ./update.py;



  meta = with lib; {

pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "fcitx5-chewing";

  version = "5.0.12";

  version = "5.0.13";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-3VC6hp8WN6Ttfw5TcpgjTUYxXJxmU6SUw7ZfjR+Laig=";

    sha256 = "sha256-bYkIf2TFwRzfl0tYeq6rZUETz3lbT1LEaUAuG7d35yU=";

  };



  nativeBuildInputs = [

pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix

+2 −2
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ in 


mkDerivation rec {

  pname = "fcitx5-chinese-addons";

  version = "5.0.15";

  version = "5.0.16";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-9AGL0eAkaA2N/aE8VlgRCnW2lAl55SroBumeU5xkW5M=";

    sha256 = "sha256-P3SXiuxKwA+vrlp/dp13xxOQrf8/DMgdGCPwjbbZpU4=";

  };



  cmakeFlags = [