Vladimír Čunát 665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs ... The patch to allow using license shortnames as attributes was not included (yet). Conflicts (auto-solved): pkgs/development/libraries/libtiff/default.nix		2014-08-12 19:08:53 +02:00
..
audio	lastwatch: unsupported on darwin due to inotify	2014-08-10 11:50:43 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	haskell-yi: update to 0.8.2	2014-08-11 13:56:12 +02:00
graphics	luminanceHDR: add version 2.4.0	2014-08-12 10:19:35 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Merge #3408: licenses: prefer spdx.org, improve docs	2014-08-12 19:08:53 +02:00
networking	Help kadu find phonon	2014-08-12 16:22:25 +04:00
office	Update libreoffice to the version 4.3.0.4	2014-08-12 01:49:54 +04:00
science	Allow optional functionality in SimGrid	2014-08-12 14:09:54 +04: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	Don't build broken Haskell packages on Hydra.	2014-08-12 12:37:44 +02:00
video	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
virtualization	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00
window-managers	Add the bspwm window manager to Nix.	2014-08-12 18:22:15 +02:00