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 |
||
---|---|---|
.. | ||
buildenv | ||
builder-defs | ||
checker | ||
dotnetenv | ||
fetchbzr | ||
fetchcvs | ||
fetchdarcs | ||
fetchfile | ||
fetchgit | ||
fetchhg | ||
fetchmtn | ||
fetchsvn | ||
fetchsvnssh | ||
fetchurl | ||
gcc-cross-wrapper | ||
gcc-upc-wrapper | ||
gcc-wrapper | ||
kernel | ||
make-desktopitem | ||
make-symlinks | ||
make-wrapper | ||
mono-dll-fixer | ||
native-darwin-cctools-wrapper | ||
nuke-references | ||
release | ||
src-only | ||
substitute | ||
upstream-updater | ||
vm | ||
vsenv | ||
source-from-head-fun.nix | ||
trivial-builders.nix |