public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126327 from NixOS/backport-126093-to-release-21.05

This commit is contained in:
Artturi 2021-08-07 01:32:40 +03:00 committed by GitHub
parent 3755587738 eed26e1d22
commit 8bd8141ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libime/default.nix
View File

@ -18,21 +18,21 @@ let
url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2";
sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm";
}; };
dictVer = "20200715"; dictVer = "20210402";
dict = fetchurl { dict = fetchurl {
url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz";
sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0=";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libime"; pname = "libime";
version = "1.0.3"; version = "1.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "libime"; repo = "libime";
rev = version; rev = version;
sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

4
pkgs/development/libraries/xcb-imdkit/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xcb-imdkit"; pname = "xcb-imdkit";
version = "1.0.2"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "xcb-imdkit"; repo = "xcb-imdkit";
rev = version; rev = version;
sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
View File

@ -31,13 +31,13 @@ in
mkDerivation rec { mkDerivation rec {
pname = "fcitx5-chinese-addons"; pname = "fcitx5-chinese-addons";
version = "5.0.3"; version = "5.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fcitx"; owner = "fcitx";
repo = "fcitx5-chinese-addons"; repo = "fcitx5-chinese-addons";
rev = version; rev = version;
sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU=";
}; };
cmakeFlags = [ cmakeFlags = [

5
pkgs/tools/inputmethods/fcitx5/update.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests #!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests
from nix_prefetch_github import * from nix_prefetch_github import *
import json import json
@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c
OWNER = "fcitx" OWNER = "fcitx"
def get_latest_tag(repo, owner=OWNER): def get_latest_tag(repo, owner=OWNER):
r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo))
, auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265'))
return r.json()[0].get("name") return r.json()[0].get("name")
def main(): def main():