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 |
||
---|---|---|
.. | ||
analysis | ||
build-managers | ||
cdecl | ||
documentation | ||
guile | ||
haskell | ||
java | ||
literate-programming/noweb | ||
misc | ||
ocaml | ||
parsing | ||
profiling | ||
selenium/remote-control |