Vladimír Čunát e51f73652d Merge recent master into staging ...

Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)

2014-08-30 10:04:02 +02:00

..

audio

cantata: update to 1.4.1

2014-08-28 00:09:26 +01:00

display-managers

freetype: major update, including some CVE security

2014-06-17 09:00:29 +02:00

editors

Merge recent master into staging

2014-08-30 10:04:02 +02:00

graphics

gimp: Update to 2.8.14.

2014-08-27 18:46:24 +02:00

ike

Fix various evaluation problems

2014-08-22 11:57:40 +02:00

inferno

Add missing 's' in remaining meta.maintainer(s) attrs

2014-07-22 23:49:21 +02:00

misc

Merge pull request #3813 from AndersonTorres/lilyterm

2014-08-29 01:30:35 +04:00

networking

Merge recent master into staging

2014-08-30 10:04:02 +02:00

office

Fix many package descriptions

2014-08-24 22:31:37 +02:00

science

coq_HEAD: update to latest Git HEAD

2014-08-26 16:36:50 -05: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

Merge recent master into staging

2014-08-30 10:04:02 +02:00

video

Merge pull request #3527 from AndersonTorres/mpv

2014-08-29 01:41:22 +04:00

virtualization

Merge recent master into staging

2014-08-30 10:04:02 +02:00

window-managers

Fix many package descriptions

2014-08-24 22:31:37 +02:00