Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
lisp-modules	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
misc	avr-gcc: set meta.platforms = linux	2014-05-31 18:10:29 +02:00
mobile	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
ocaml-modules	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
perl-modules	perl-dbix-class: Fix tests with newer SQLite.	2014-04-22 16:27:28 +02:00
python-modules	Merge pull request #3056 from aherrmann/pr_tables	2014-06-23 22:58:04 +02:00
qtcreator	qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.	2014-06-11 21:30:21 +02:00
r-modules	cran-packages.nix: fix a couple of builds	2014-06-09 12:58:48 +02:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
web	nodejs: Update to 0.10.29	2014-06-29 11:47:07 +08:00