Merge pull request #249922 from linsui/fcitx5

fcitx5-*: update to 5.1.0
This commit is contained in:
Nick Cao 2023-08-22 07:45:56 +08:00 committed by GitHub
commit 7f7b8febdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 41 additions and 50 deletions

View file

@ -1,4 +1,5 @@
{ 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;
};

View file

@ -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})
'';

View file

@ -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 ];

View file

@ -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 = [

View file

@ -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 = [

View file

@ -21,13 +21,13 @@
mkDerivation rec {
pname = "fcitx5-configtool";
version = "5.0.17";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-nYHrJBcbaYxZ61OEFfnwTTsZFEBtDJkR0kuYPyTcjio=";
sha256 = "sha256-kjoAcoqLJ8XHMI6NUr5DZfltWfX3GPco3VGseze6qbw=";
};
cmakeFlags = [

View file

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-gtk";
version = "5.0.23";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-RMi2D9uqGmvyDIB7eRbr52aahCJ5u21jCyZ9hbCDdKY=";
sha256 = "sha256-xVBmFFUnlWqviht/KGFTHCd3xCln/6hyBG72tIHqopc=";
};
cmakeFlags = [

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-hangul";
version = "5.0.11";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-VA9LDGMJRJDDCxIsx7wpDgdc2V9cuWlydAq5yiIvpxA=";
sha256 = "sha256-3cJLF80oAqGSJvPPyKcHxaWysA9RtWYGgptailYd4dk=";
};
nativeBuildInputs = [

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-m17n";
version = "5.0.11";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-MCSJGZGpnOcZ9ZHlUDOPrbfo61HRM4s2xuj8zblyW/8=";
sha256 = "sha256-qo3tS0tjQCD7+CoNvjyvhQPAfa38o7/f/MjqRkIL2R0=";
};
nativeBuildInputs = [

View file

@ -13,13 +13,13 @@
mkDerivation rec {
pname = "fcitx5-qt";
version = "5.0.17";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-Pi5Xb7H/h89OcTzYX7X3Xw8FQIczkWd6rMrbwnHr/L4=";
sha256 = "sha256-LWOELt1uo5TtM85ppxt6MK7fvUuocHkWXYjUE1yyOV4=";
};
preConfigure = ''

View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
{ lib
, stdenv
, fetchurl
, pkg-config
, cmake
, extra-cmake-modules
@ -13,13 +14,11 @@
stdenv.mkDerivation rec {
pname = "fcitx5-rime";
version = "5.0.16";
version = "5.1.1";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-YAunuxdMlv1KOj2/xXstb/Uhm97G9D9rxb35AbNgMaE=";
src = fetchurl {
url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-qo0m/asTranm70PHPLwWCn/jX+FWNEGRKBRNNW+B28A=";
};
cmakeFlags = [

View file

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-skk";
version = "5.0.15";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-y5GciWJMEFQM8SsqYANXe/SdVq6GEqsfF1yrKKhw0KA=";
sha256 = "sha256-N69OyGzJGO27tsR1g06d0EILsX2mpbW/tIgeSLc06OU=";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-extra";
version = "5.0.13";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-/YIZMSCKJlnPL+pmUWfVf8tINKjXKkGAK7rWQ98RRjQ=";
sha256 = "sha256-os2C/6r9hz/3MEAny8Klc01cRGIiKD39rdu56kQDCnQ=";
};
nativeBuildInputs = [

View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-table-other";
version = "5.0.11";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = pname;
rev = version;
sha256 = "sha256-Km0c6so+Ed/lbK9t54stWjlkK70aEcf7EbQm7msPDKM=";
sha256 = "sha256-ymHAKaPmQckxM/XHoDOVSzEWpyQGb7zVG21CDwNfyjg=";
};
nativeBuildInputs = [

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "fcitx5-unikey";
version = "5.0.13";
version = "5.1.0";
src = fetchFromGitHub {
owner = "fcitx";
repo = "fcitx5-unikey";
rev = version;
sha256 = "sha256-UpCXcgVUGe5/yunLqRNx2H2aLOnD1wJNA8y3q8R4+sY=";
sha256 = "sha256-X00/jGtbApWtS9+S6lTXJ0+BK7SUsLA1sKxq0vW1VNE=";
};
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];

View file

@ -1,7 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell -i python3 -p nix-update python3Packages.requests
from nix_prefetch_github import *
import requests
import subprocess