Unverified Commit 6365771a authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Fcitx5 5.1.19 (#501011)

parents a940e386 03c62e5b

pkgs/by-name/li/libime/package.nix

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

stdenv.mkDerivation (finalAttrs: {

  pname = "libime";

  version = "1.1.12";

  version = "1.1.14";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "libime";

    tag = finalAttrs.version;

    hash = "sha256-LqbwXpmqUCbaKHaaE9pOrHb1Qdp20/S3QEf9F4/3oiE=";

    hash = "sha256-q9OSY1q4MNlFqw6lRMrHO6QT9xP8Czz4b4M0BuIkp34=";

    fetchSubmodules = true;

  };

pkgs/by-name/li/libskk/package.nix

+2 −12
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  libtool,

  gettext,

  pkg-config,
@@ -17,13 +16,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libskk";

  version = "1.0.5";

  version = "1.1.0";



  src = fetchFromGitHub {

    owner = "ueno";

    repo = "libskk";

    tag = finalAttrs.version;

    hash = "sha256-xXed7mQqseefIldGjNsQf8n0YTcI9L9T1FkO/dhNR3g=";

    hash = "sha256-Dciz5VeflaX2eYt1B90NpgLKNtCHY/CDabuCx+T/SS0=";

  };



  env = {
@@ -32,15 +31,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ];

  };



  patches = [

    # fix parse error in default.json

    # https://github.com/ueno/libskk/pull/90

    (fetchpatch {

      url = "https://github.com/ueno/libskk/commit/2382ebedc8dca88e745d223ad7badb8b73bbb0de.diff";

      hash = "sha256-e1bKVteNjqmr40XI82Qar63LXPWYIfnUVlo5zQSkPNw=";

    })

  ];



  buildInputs = [ libxkbcommon ];

  nativeBuildInputs = [

    vala

pkgs/tools/inputmethods/fcitx5/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  wayland,

  systemd,

  wayland-protocols,

  json_c,

  nlohmann_json,

  isocodes,

  xkeyboard_config,

  enchant,
@@ -45,13 +45,14 @@ let 
in

stdenv.mkDerivation rec {

  pname = "fcitx5";

  version = "5.1.16";

  version = "5.1.19";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    hash = "sha256-aedYDpxYeUXadJnV+u1cQrNGoiW8WZKAgP4eNcvkScI=";

    hash = "sha256-ZsGRVuUpWIJnsSqcAQcerxvwWIRaGdAO2FM1k3D3g0M=";

    fetchSubmodules = true;

  };



  prePatch = ''
@@ -79,7 +80,7 @@ stdenv.mkDerivation rec { 
    gdk-pixbuf

    wayland

    wayland-protocols

    json_c

    nlohmann_json

    libGL

    libuuid

    libselinux

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

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


stdenv.mkDerivation rec {

  pname = "fcitx5-chinese-addons";

  version = "5.1.10";

  version = "5.1.12";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    hash = "sha256-kVBDfr8NKsQQQX69N3/fVqJgObRNSX2p0GNSUjbZvcg=";

    hash = "sha256-bAx5m+tU8hT1WdaLChpQV3J0l+QJzDLzMEPTgjEGCuw=";

  };



  nativeBuildInputs = [
@@ -51,15 +51,6 @@ stdenv.mkDerivation rec { 
    fcitx5-lua

  ];



  patches = [

    # Without this patch, setting ENABLE_CLOUDPINYIN to off would fail to build

    (fetchpatch {

      name = "cloudpinyin-disable-build";

      url = "https://github.com/fcitx/fcitx5-chinese-addons/commit/024fff9c8587ca2fb01905e9a25df838e7d99da2.patch";

      hash = "sha256-Mo5l8tsn1JQxTFHxOZfQRmbCeWZHLyxfn2Qwv/gQXGA=";

    })

  ];



  prePatch = ''

    ln -s ${pyStroke} modules/pinyinhelper/$(stripHash ${pyStroke})

    ln -s ${pyTable} modules/pinyinhelper/$(stripHash ${pyTable})

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

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

stdenv.mkDerivation rec {

  pname = "fcitx5-qt${majorVersion}";

  version = "5.1.12";

  version = "5.1.13";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = "fcitx5-qt";

    rev = version;

    hash = "sha256-Nrt49TltV3Us93MWUX4tBs0576jEC1kRX+T9IddVgZk=";

    hash = "sha256-CrrQQPtWQwE6eZOJB+uLVUjPJMKW/sz/tij41dyEe0U=";

  };



  postPatch = ''