Merge pull request #249922 from linsui/fcitx5 (7f7b8feb) · Commits · nix / nixpkgs

pkgs/development/libraries/libime/default.nix

+8 −7

Original line number	Diff line number	Diff line
		{ lib, stdenv
		{ lib
		, stdenv
		, fetchurl
		, fetchFromGitHub
		, cmake
		@@ -13,26 +14,26 @@ let
		url = "https://download.fcitx-im.org/data/table.tar.gz";
		sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
		};
		arpaVer = "20220810";
		arpaVer = "20230712";
		arpa = fetchurl {
		url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz";
		sha256 = "sha256-oRvJfSda2vGV+brIVDaK4GzbSg/h7s9Z21rlgGFdtPo=";
		hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI=";
		};
		dictVer = "20220810";
		dictVer = "20230412";
		dict = fetchurl {
		url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz";
		sha256 = "sha256-lxdS9BMYgAfo0ZFYwRuFyVXiXXsyHsInXEs69tioXSY=";
		hash = "sha256-8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc=";
		};
		in
		stdenv.mkDerivation rec {
		pname = "libime";
		version = "1.0.17";
		version = "1.1.0";

		src = fetchFromGitHub {
		owner = "fcitx";
		repo = "libime";
		rev = version;
		sha256 = "sha256-mc0Mknqki0pY4oKf8B6H67N+1eMu7wbqF7wES22Kw1A=";
		sha256 = "sha256-r1Px93Ly7FzcRaPUNTHNcedzHPHocnUj8t8VMZqXkFM=";
		fetchSubmodules = true;
		};

+2 −10

Original line number	Diff line number	Diff line
		@@ -43,23 +43,15 @@ let
		in
		stdenv.mkDerivation rec {
		pname = "fcitx5";
		version = "5.0.23";
		version = "5.1.0";

		src = fetchFromGitHub {
		owner = "fcitx";
		repo = pname;
		rev = version;
		hash = "sha256-zS25XeNtBN7QIi+Re/p1uLoH/Q4xKAsFrEmgk2LYRu8=";
		hash = "sha256-tnYyHhldPmMZcygpcOcbaYFQbRQjPr/FlvyYfRylTmQ=";
		};

		patches = [
		# Fix compatiblity with fmt 10.0. Remove with the next release
		(fetchpatch {
		url = "https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch";
		hash = "sha256-Z4Sqdyp/doJPTB+hEUrG9vncUP29L/b0yJ/u5ldpnds=";
		})
		];

		prePatch = ''
		ln -s ${enDict} src/modules/spell/$(stripHash ${enDict})
		'';

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,11 +2,11 @@

		stdenv.mkDerivation rec {
		pname = "fcitx5-anthy";
		version = "5.0.14";
		version = "5.1.0";

		src = fetchurl {
		url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.xz";
		sha256 = "sha256-CodNcN9O8i8euGjCfq9m4zVOFgnbje05JUT49rxUp7c=";
		sha256 = "sha256-tyWxNhCreJaAc+IUH85iayo8OALcY0ytFc7Aa8Ye80M=";
		};

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

+2 −2

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

		stdenv.mkDerivation rec {
		pname = "fcitx5-chewing";
		version = "5.0.14";
		version = "5.1.0";

		src = fetchFromGitHub {
		owner = "fcitx";
		repo = pname;
		rev = version;
		sha256 = "sha256-zfaq5pkHcB12iFvXWvvzmX9mpcXAZSri9lVlzfePLAQ=";
		sha256 = "sha256-Zjwt7JHwCfXlY46qRTXSmXI69fANZNI7DY1ixpMEqPM=";
		};

		nativeBuildInputs = [

+2 −2

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

		mkDerivation rec {
		pname = "fcitx5-chinese-addons";
		version = "5.0.17";
		version = "5.1.0";

		src = fetchFromGitHub {
		owner = "fcitx";
		repo = pname;
		rev = version;
		sha256 = "sha256-Licj/sZ2rZablsk/ytCZlkdjSHszr31JURrQkXs1BXE=";
		sha256 = "sha256-Z5X/yKxj8jX/einrebkP6rSCSrKvaQ7vOlbmT1IKXfY=";
		};

		cmakeFlags = [