Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
..
arduino
compilers	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
eclipse
guile-modules	guile_lib: update from 0.2.1 to 0.2.2	2013-12-16 01:36:18 +02:00
interpreters	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
libraries	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
lisp-modules	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
misc
mobile	Revert android build tools update	2013-12-02 21:41:40 -05:00
ocaml-modules	added OCaml package ocamlsdl	2013-12-05 16:20:32 +01:00
perl-modules	BerkeleyDB: update to 0.54	2013-12-15 00:27:22 +04:00
python-modules	pycrypto: remove version 2.5 since it's vulnerable to CVE-2012-2417, CVE-2013-1445	2013-12-13 11:13:23 +02:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
web