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

Merge pull request #306257 from Vonfry/fcitx5-5.1.9 

fcitx5: 5.1.8 -> 5.1.9 and its addons
parents e042cb02 19d43941

pkgs/development/libraries/libime/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -21,21 +21,21 @@ let 
    url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz";

    hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI=";

  };

  dictVer = "20230412";

  dictVer = "20240416";

  dict = fetchurl {

    url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz";

    hash = "sha256-8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc=";

    url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst";

    hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c=";

  };

in

stdenv.mkDerivation rec {

  pname = "libime";

  version = "1.1.6";

  version = "1.1.7";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "libime";

    rev = version;

    hash = "sha256-PhzJtAGmSkMeXMSe2uR/JKHKlZtL0e3tPDZVoRCvAis=";

    hash = "sha256-I8zznZlMz1U2DAVYkvtF1thEYz/tIEbA682y7czK5ck=";

    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.7";

  version = "1.0.8";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "xcb-imdkit";

    rev = version;

    sha256 = "sha256-trfKWCMIuYV0XyCcIsNP8LCTc0MYotXvslRvp76YnKU=";

    hash = "sha256-ANU3suG62G0M5ZUWaNcwD4ot/EYSK7236zGVQZIjjuE=";

  };



  nativeBuildInputs = [

pkgs/tools/inputmethods/fcitx5/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
, stdenv

, fetchurl

, fetchFromGitHub

, fetchpatch

, pkg-config

, cmake

, extra-cmake-modules
@@ -44,13 +43,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "fcitx5";

  version = "5.1.8";

  version = "5.1.9";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    hash = "sha256-MeknggrpOzpkT1EXZCftIrlevuMEEHM5d8vszKRp+DI=";

    hash = "sha256-zapkhDM8rrZwJhaafFVsBjjkK/bRJsZqUkq9RyOqV3E=";

  };



  prePatch = ''

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

+6 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, pkg-config, fcitx5, anthy, gettext }:

{ lib, stdenv, fetchurl, cmake, extra-cmake-modules, pkg-config, fcitx5, anthy

, gettext, zstd }:



stdenv.mkDerivation rec {

  pname = "fcitx5-anthy";

  version = "5.1.3";

  version = "5.1.4";



  src = fetchurl {

    url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz";

    sha256 = "sha256-pOJYe5+/11j8YmuJDyAbFPFsnUa9DQqbYirSwD992zY=";

    url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";

    hash = "sha256-e0X00plXfRgoSkhTDVJfububin8h+NiGzrnOSIaSa7g=";

  };



  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config zstd ];

  buildInputs = [ fcitx5 anthy gettext ];



  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.1.1";

  version = "5.1.2";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-boIkbtNLPTNXY9e5gdQklhJuDU36ZswOqY2X8nRKqho=";

    hash = "sha256-Zl/YlN5qIB8rjL4lPwRcKRoId0i1ovMOLJKGmTUHuwo=";

  };



  nativeBuildInputs = [