forked from mirrors/nixpkgs
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 |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
COPYING | ||
default.nix | ||
STABLE | ||
VERSION |