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

..

audio

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

display-managers

berlios.de probably shut down, replace it

2014-05-18 13:30:27 +02:00

editors

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

graphics

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

ike

ike: use stdenv.lib.licenses.sleepycat

2014-03-24 19:58:36 -05:00

misc

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

networking

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

office

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

science

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

search

…

taxes

Add aangifte-2013

2014-03-01 16:54:16 +01:00

version-management

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

video

Another attempt to eradicate ensureDir

2014-06-30 14:56:10 +02:00

virtualization

qemu: 1.7.1 -> 2.0.0

2014-05-18 15:52:44 -05:00

window-managers

fetchbzr, fetchdarcs, fetchhg: use rev attr

2014-06-28 21:06:10 +02:00