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

Merge branch 'master' into staging-next

Browse Source 
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
This commit is contained in:
Jan Tojnar
2021-03-13 19:16:43 +01:00
parent 1df29ee456 5e367ecef9
commit 01a4d350c7
76 changed files with 1936 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
View File

@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "ibus-anthy";
version = "1.5.11";
version = "1.5.12";
src = fetchurl {
url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0";
sha256 = "sha256-6edY3dRq4pI3bqsXEYf6jyBjDwpXzRKKQSCP3N/fV7s=";
};
buildInputs = [

4
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "ibus-table";
version = "1.12.3";
version = "1.12.4";
src = fetchFromGitHub {
owner = "kaio";
repo = "ibus-table";
rev = version;
sha256 = "sha256-iVbct7p+i8ifSQzOFUUnJU0RHX36cFiTlv7p79iawj8=";
sha256 = "sha256-2qST5k2+8gfSf1/FaxXW4qwSQgNw/QKM+1mMWDdrjCU=";
};
postPatch = ''