Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
anthy	anthy: use osdn mirror	2019-06-08 23:41:30 -05:00
fcitx	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
fcitx-engines	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
fusuma	bundlerUpdateScript: init and use (#64822)	2019-07-22 12:02:47 +00:00
ibus	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
ibus-engines	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
interception-tools	pkgs/*: remove unreferenced function arguments	2018-07-21 02:48:04 +00:00
keyfuzz	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
libinput-gestures	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
libkkc	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
m17n-db	Treewide: use HTTPS on GNU Savannah domains	2018-12-02 15:33:09 +01:00
m17n-lib	Treewide: use HTTPS on GNU Savannah domains	2018-12-02 15:33:09 +01:00
nabi
skk	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
tegaki-zinnia-japanese	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
touchegg	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
triggerhappy	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
uim	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
zinnia	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00