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 | ||
default.nix | ||
dragonegg-2.7.patch | ||
ghdl-ortho-cflags.patch | ||
gnat-cflags.patch | ||
java-jvgenmain-link.patch | ||
libstdc++-target.patch | ||
no-sys-dirs.patch | ||
softfp-hurd.patch | ||
sources.nix | ||
update-gcc.sh |