Vladimír Čunát 4c3e6a4675 xorg: go back to using the new nix syntax ... This reverts commit 86a372683a. The original revert was just temporary. Conflicts (auto-solved): pkgs/servers/x11/xorg/default.nix		2014-08-31 12:20:34 +02:00
..
applications	Merge branch 'staging' into v/modular	2014-08-30 08:33:10 +02:00
build-support	multi-out: auto-correct include dirs in *.pc	2014-08-30 23:29:23 +02:00
data	man-pages: Update to 3.70	2014-08-19 11:46:08 +02:00
desktops	Merge 'staging'	2014-08-24 10:50:22 +02:00
development	various packages fixed	2014-08-30 23:30:31 +02:00
games	update minecraft-server to 1.7.10	2014-08-18 18:51:51 -07:00
misc	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
os-specific	various packages fixed	2014-08-30 23:30:31 +02:00
servers	xorg: go back to using the new nix syntax	2014-08-31 12:20:34 +02:00
shells	WIP: getting good	2014-08-27 01:14:09 +02:00
stdenv	Merge branch 'staging' into v/modular	2014-08-30 08:33:10 +02:00
test
tools	WIP: getting better	2014-08-30 19:11:52 +02:00
top-level	WIP: getting better	2014-08-30 19:11:52 +02:00