Merge branch 'master' into staging-next

Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
This commit is contained in:
Vladimír Čunát
2018-08-13 20:42:33 +02:00
70 changed files with 1689 additions and 473 deletions

View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "ibus-hangul-${version}";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs";
};
buildInputs = [ gtk3 ibus libhangul python3 ];