Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
arduino	Fix some more Hydra evaluation errors	2013-10-08 11:07:14 +02:00
compilers	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
eclipse
guile-modules
interpreters	Update xonotic to 0.7.	2013-11-21 09:41:01 +01:00
libraries	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
lisp-modules	A few hooks for easier library handling when CFFI is used	2013-10-29 11:29:46 +04:00
misc	Some description fixes	2013-10-05 19:36:23 +02:00
mobile	We need to use ... to allow other parameters	2013-10-15 16:48:42 +02:00
ocaml-modules	More description fixes	2013-10-06 12:01:38 +02:00
perl-modules	Fix some meta.platforms attributes to build more stuff on Darwin	2013-11-05 10:46:59 +01:00
python-modules	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
qtcreator	qtcreator: Make the qt package optional and introduce the QtSDK	2013-10-21 09:36:45 +02:00
r-modules/generic	Wrapped R's package system similarly to perlPackages	2013-09-28 13:19:43 +02:00
ruby-modules
tools	swig: bump 2.0.4 -> 2.0.11	2013-11-22 09:41:17 +08:00
web	Update nodePackages to npm2nix-5.2.0	2013-11-05 18:02:21 -05:00