7079e744d4
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 |
||
---|---|---|
.. | ||
antlr | ||
bison | ||
byacc | ||
flex | ||
flexc++ | ||
hammer | ||
jikespg | ||
jshon | ||
lemon | ||
peg | ||
ragel | ||
re2c |