Jonathan Ringer d1d37feb6d Merge branch 'master' into staging-next ... Conflicts: pkgs/servers/x11/xorg/default.nix		2021-06-15 19:32:36 -07:00
..
quartz-wm	treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix	2021-01-19 01:16:25 -08:00
xorg	Merge branch 'master' into staging-next	2021-06-15 19:32:36 -07:00
xquartz	pkgs/servers: stdenv.lib -> lib	2021-01-15 14:24:03 +07:00