forked from mirrors/nixpkgs
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 |
||
---|---|---|
.. | ||
unichrome | ||
builder.sh | ||
default.nix | ||
extra.list | ||
generate-expr-from-tarballs.pl | ||
imake.patch | ||
imake.sh | ||
old.list | ||
overrides.nix | ||
replacements.nix | ||
tarballs-7.5.list | ||
xorgserver-dri-path.patch | ||
xorgserver-xkbcomp-path.patch | ||
xorgserver.sh |