nixpkgs

T

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

doc

* Updated gtk+, glib, pango.

2010-01-13 12:11:06 +00:00

maintainers

* Add a script to retrieve licenses of the current derivation and of all

2009-11-21 17:50:00 +00:00

pkgs

Merging from trunk.

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

COPYING

* Applying an MIT-style license to Nixpkgs.