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 |
||
---|---|---|
.. | ||
busybox | ||
cups | ||
drivers | ||
emulators | ||
foldingathome | ||
freestyle | ||
ghostscript | ||
gxemul | ||
jackaudio | ||
lilypond | ||
maven | ||
my-env | ||
sane-backends | ||
sane-front | ||
screensavers | ||
source-and-tags | ||
tex | ||
trac | ||
uboot | ||
xosd | ||
xsane | ||
misc.nix |