Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
darwin	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
unichrome	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
builder.sh
default.nix	xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)	2014-11-05 07:55:25 +01:00
extra.list	xorg: updates some modules; mostly minor changes	2014-10-19 20:10:19 +02:00
generate-expr-from-tarballs.pl	get xorg/x11 working on Darwin	2014-08-12 20:40:57 -04:00
imake.patch
imake.sh
libpciaccess-apple.patch
old.list	xorg: updates some modules; mostly minor changes	2014-10-19 20:10:19 +02:00
overrides.nix	xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)	2014-11-05 07:55:25 +01:00
replacements.nix
tarballs-7.7.list	xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)	2014-11-05 07:55:25 +01:00
xf86-video-intel-testing.nix	xorg: maintenance updates of several modules	2014-06-17 09:00:29 +02:00
xkeyboard-config-eo.patch	Bringing back the xkeyboard-config eo patch	2014-03-24 10:42:00 +01:00
xorgserver-xkbcomp-path.patch