Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
..
unichrome	xorg-video-unichrome: Update git url, fix build with new xorg	2012-07-15 22:40:52 -04:00
builder.sh	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
default.nix	libXrender, libXvMC: Update	2013-06-14 14:53:36 +02:00
extra.list	X security updates	2013-06-05 21:24:19 +02:00
generate-expr-from-tarballs.pl	libXrender, libXvMC: Update	2013-06-14 14:53:36 +02:00
imake.patch	* Update the imake patch.	2010-07-19 10:18:06 +00:00
imake.sh	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
libpciaccess-apple.patch	Get libpciaccess to compile on darwin	2011-08-29 18:58:59 +00:00
old.list	X security updates	2013-06-05 21:24:19 +02:00
overrides.nix	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00
replacements.nix	* composedArgsAndFun -> makeOverridable for consistency.	2010-07-29 08:21:21 +00:00
tarballs-7.7.list	libXrender, libXvMC: Update	2013-06-14 14:53:36 +02:00
xorgserver-dri-path.patch	xorgserver: Update dir path patch	2012-07-14 15:03:36 -04:00
xorgserver-xkbcomp-path.patch	xorgserver: Update xkbcomp-path patch	2012-07-14 15:13:08 -04:00
xorgserver12-CVE-1940.patch	xorg-server: fix CVE-1940	2013-04-18 12:50:26 +02:00