Jonathan Ringer 14f3686af1 Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix

2021-05-20 09:12:42 -07:00

..

0001-add-placeholder-for-nm.patch

wayland: fix cross (#105103)

2020-11-27 12:09:53 +01:00

default.nix

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-20 09:12:42 -07:00

protocols.nix

wayland-protocols: 1.20 -> 1.21

2021-04-30 21:45:59 +02:00