nixpkgs/pkgs/os-specific
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
..
darwin pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin 2009-11-05 13:44:30 +00:00
linux Merging from trunk. 2010-01-14 14:49:31 +00:00