Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +02:00
..
audio	moc: update from 2.5.0-beta2 to 2.5.0	2014-09-04 22:29:01 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
graphics	Add new kgraphviewer and massif-visualizer packages	2014-09-03 17:04:22 +02:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	calibre: update from 2.1.0 to 2.2.0	2014-09-05 23:53:50 +02:00
networking	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
office	zim: fixed build; it also runs find now but the solution is hacky	2014-09-04 23:54:14 +02:00
science	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	diffuse: update from 0.4.7 to 0.4.8	2014-09-04 19:31:33 +02:00
video	CImg and WxCam - New Packages #3519	2014-09-04 20:44:05 +04:00
virtualization	Merge recent master into staging	2014-09-06 16:52:45 +02:00
window-managers	Fix many package descriptions	2014-08-24 22:31:37 +02:00