mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
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 |
||
|---|---|---|
| .. | ||
| docs | ||
| scripts | ||