Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ... Conflicts: pkgs/applications/editors/vim/macvim.nix		2014-11-04 14:30:43 +01:00
..
arduino
compilers	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
coq-modules
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
libraries	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
lisp-modules
lua-modules
misc
mobile
ocaml-modules	iconv: remove usage on Linux in several packages	2014-11-03 12:58:54 +01:00
perl-modules
pharo
pure-modules/pure-gsl
python-modules
qtcreator
r-modules	r-PoweR: fix build	2014-11-02 14:09:53 +01:00
ruby-modules
tools	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
web