Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ...

Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix

2014-01-18 14:46:20 +01:00

..

arduino

…

compilers

Merge master into stdenv-updates

2014-01-18 14:46:20 +01:00

eclipse

ecj: Add a setup hook that makes Ant use ECJ automatically

2014-01-06 14:36:15 +01:00

guile-modules

guile_lib: update from 0.2.1 to 0.2.2

2013-12-16 01:36:18 +02:00

interpreters

Merge master into stdenv-updates

2014-01-18 14:46:20 +01:00

libraries

Merge master into stdenv-updates

2014-01-18 14:46:20 +01:00

lisp-modules

Merge master into stdenv-updates

2014-01-12 12:29:24 +01:00

misc

…

mobile

Make iphone SDK 7.0 the default

2014-01-15 21:52:43 +01:00

ocaml-modules

…

perl-modules

perlPackages.DBFile: update from 1.826 to 1.831

2013-12-21 02:28:25 +02:00

python-modules

kde4(10).pykde4: fix build via downgrading sip and pyqt4

2014-01-16 08:59:31 +01:00

qtcreator

…

r-modules/generic

…

ruby-modules

…

tools

Merge master into stdenv-updates

2014-01-18 14:46:20 +01:00

web

Fixed xcode patch to make nodejs work on darwin again

2014-01-13 13:48:04 +01:00