5417c720fd
I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878 |
||
---|---|---|
.. | ||
builder.sh | ||
common.nix | ||
default.nix | ||
gnu89-inline.patch | ||
info.nix | ||
locales-builder.sh | ||
locales.nix | ||
mod_nano.patch | ||
nss-skip-unavail.patch | ||
rpcgen-path.patch | ||
stack-protector-link.patch |