Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ... I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438		2010-01-14 14:49:31 +00:00
..
unichrome	Fixing the url for the xorg video unichrome driver.	2009-11-06 19:26:00 +00:00
builder.sh	Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build	2009-11-23 19:45:18 +00:00
default.nix	* xorg-server updated to 1.7.4, along with some other X.org packages.	2010-01-13 11:51:45 +00:00
extra.list	* xorg-server updated to 1.7.4, along with some other X.org packages.	2010-01-13 11:51:45 +00:00
generate-expr-from-tarballs.pl	* Fix the font packages. They need a --with-fontrootdir flag now.	2009-10-30 08:20:03 +00:00
imake.patch
imake.sh	* Got rid of a lot of "postInstall=postInstall" and similar lines in	2009-04-23 13:31:10 +00:00
old.list	* xorg-server updated to 1.7.4, along with some other X.org packages.	2010-01-13 11:51:45 +00:00
overrides.nix	Updating from trunk.	2009-12-10 14:48:45 +00:00
replacements.nix	* Remove ... for now.	2008-10-29 09:42:11 +00:00
tarballs-7.5.list	* xorg-server updated to 1.7.4, along with some other X.org packages.	2010-01-13 11:51:45 +00:00
xorgserver-dri-path.patch	Updating the xorg dri path patch for dri2.	2009-11-06 21:15:59 +00:00
xorgserver-xkbcomp-path.patch
xorgserver.sh	* Got rid of a lot of "postInstall=postInstall" and similar lines in	2009-04-23 13:31:10 +00:00