Jonathan Ringer 11a9ac00fc Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
 pkgs/tools/networking/xh/default.nix

2021-05-22 18:19:10 -07:00

..

2.68.nix

glibmm_2_68: 2.68.0 -> 2.68.1

2021-05-22 15:30:04 +00:00

default.nix

glibmm: don't manually enableParallelBuilding

2021-05-12 11:57:35 +00:00