nixpkgs/pkgs/development
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
..
arduino
compilers Merge 'mingw-w64' and 'darwin' into cross-win-osx. 2014-03-12 10:16:51 +01:00
eclipse
guile-modules
interpreters Merge 'mingw-w64' and 'darwin' into cross-win-osx. 2014-03-12 10:16:51 +01:00
libraries Merge 'mingw-w64' and 'darwin' into cross-win-osx. 2014-03-12 10:16:51 +01:00
lisp-modules
misc
mobile Add new package "xpwn" from @dborca's fork. 2014-03-12 10:00:43 +01:00
ocaml-modules
perl-modules
python-modules quodlibet: Fix evaluation 2014-03-10 14:51:05 +01:00
qtcreator
r-modules/generic
ruby-modules
tools Merge 'mingw-w64' and 'darwin' into cross-win-osx. 2014-03-12 10:16:51 +01:00
web nodejs: update from 0.10.25 to 0.10.26 2014-02-27 18:53:48 +02:00