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 |
||
---|---|---|
.. | ||
cabextract | ||
cpio | ||
cromfs | ||
dar | ||
gnutar | ||
p7zip | ||
sharutils | ||
unrar | ||
unshield | ||
unzip | ||
zip |