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

..

applications

Merging from trunk.

2010-01-14 14:49:31 +00:00

build-support

Merging from trunk.

2010-01-14 14:49:31 +00:00

configs/etc

…

data

Updating the libstdc++ man pages to 4.4.0. We have gcc-4.3.4 in trunk, but I don't think it will be any annoyance.

2009-12-10 08:12:49 +00:00

desktops

Minor update of libsoup

2010-01-14 09:23:38 +00:00

development

Merging from trunk.

2010-01-14 14:49:31 +00:00

games

* Support x86_64-linux.

2010-01-03 23:19:57 +00:00

lib

Merging from trunk.

2010-01-14 14:49:31 +00:00

misc

Merging from trunk.

2010-01-14 14:49:31 +00:00

os-specific

Merging from trunk.

2010-01-14 14:49:31 +00:00

servers

Merging from trunk.

2010-01-14 14:49:31 +00:00

shells

GNU Bash 4.1.

2010-01-05 11:27:57 +00:00

stdenv

Merging from trunk.

2010-01-14 14:49:31 +00:00

test

Add a new way to handle option sets.

2008-08-05 17:16:35 +00:00

tools

Merging from trunk.

2010-01-14 14:49:31 +00:00

top-level

Merging from trunk.

2010-01-14 14:49:31 +00:00