9183f21f7e
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 |
||
---|---|---|
.. | ||
builder.sh | ||
config-2.6.31-armv5tel | ||
config-blocks.nix | ||
generate-config.pl | ||
generic.nix | ||
linux-2.6.25.nix | ||
linux-2.6.27.nix | ||
linux-2.6.28.nix | ||
linux-2.6.29.nix | ||
linux-2.6.31.nix | ||
linux-2.6.32.nix | ||
patches.nix | ||
sec_perm-2.6.24.patch |