Vladimír Čunát be70104a3a Merge master into x-updates ... Conflicts (taken master): pkgs/development/compilers/llvm/3.4/llvm.nix		2014-02-04 22:00:09 +01:00
..
arduino
compilers	gcc 4.8: no need for the arm eabi patch.	2014-02-04 10:18:27 +01:00
eclipse	ecj: Add a setup hook that makes Ant use ECJ automatically	2014-01-06 14:36:15 +01:00
guile-modules
interpreters	ruby/patches.nix: sort attributes alphabetically	2014-02-01 19:56:54 +01:00
libraries	Merge master into x-updates	2014-02-04 22:00:09 +01:00
lisp-modules	Merge master into stdenv-updates	2014-01-12 12:29:24 +01:00
misc	fixup previous commit: do the change to attribute	2014-01-31 18:51:10 +01:00
mobile	androidenv: also allow references to individual apk files	2014-01-28 19:09:08 +01:00
ocaml-modules	Fix some "meta.licenses" attributes	2014-01-25 03:04:46 +01:00
perl-modules	perlPackages.DBFile: update from 1.826 to 1.831	2013-12-21 02:28:25 +02:00
python-modules	Add pycangjie	2014-02-02 14:54:40 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge master into x-updates	2014-02-04 22:00:09 +01:00
web	nodejs: fix the patch to make it build on darwin	2014-02-04 18:03:21 +01:00