Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
antlr
bison
byacc	byacc: 20170201 -> 20170709	2018-01-02 12:31:33 -06:00
flex	flex: review feedback	2018-01-22 18:44:42 -06:00
flexc++	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
hammer
jikespg
jshon	jshon: 20140712 -> 20160111.2	2018-03-08 20:38:10 -08:00
lemon	Remove nckx as a maintainer for all packages	2018-01-16 23:00:49 +01:00
peg
ragel
re2c	re2c: 0.16 -> 1.0.3	2018-03-01 16:24:52 +01:00