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
..
busybox
cups	pkgs/misc/cups/default.nix: don't install files to /etc or /usr	2009-11-05 13:33:36 +00:00
drivers/gutenprint	gutenprint: Fix name, improve style.	2009-11-22 19:11:27 +00:00
emulators	Update wine dependency on flex and add myself as maintainer	2010-01-14 13:17:40 +00:00
foldingathome
freestyle
ghostscript
gxemul
jackaudio	jackaudio: symlink pkg-config description to lib	2009-09-21 09:58:24 +00:00
lilypond	update to 2.13.9	2009-12-25 00:01:31 +00:00
linuxwacom	Update Linux Wacom	2009-11-07 09:25:06 +00:00
maven	update maven2	2009-11-25 07:51:06 +00:00
my-env	Updating myEnv for the new crossCompiling stdenv, so it puts in the environment buildNativeInputs	2009-12-22 11:49:20 +00:00
sane-backends	update to 1.0.20	2009-12-24 23:27:05 +00:00
sane-front
screensavers	xlock: fixed typo in default.nix	2009-09-23 11:01:14 +00:00
source-and-tags	fix source-and-tags	2009-12-11 13:58:15 +00:00
synaptics
tex	* dblatex 0.2.12.	2009-08-22 23:11:12 +00:00
trac
uboot	Fixing the uboot cross-build.	2009-11-19 21:43:03 +00:00
xosd
xsane	update to 0.996	2009-12-24 23:19:53 +00:00
misc.nix