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

..

admin

Fix many package descriptions

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

archivers

Fix many package descriptions

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

audio

pnmixer: cleanup

2014-08-25 10:04:49 +02:00

backup

Fix many package descriptions

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

bluetooth

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

cd-dvd

Fix many package descriptions

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

compression

Merge recent master into staging

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

filesystems

Fix many package descriptions

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

graphics

Fix many package descriptions

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

inputmethods

Merge pull request #3275 from taku0/gtk-env

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

misc

Merge pull request #3826 from ruediger/up/parallel

2014-08-29 01:26:26 +04:00

networking

Merge pull request #3745 from wkennington/master.dnsmasq

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

package-management

Fix many package descriptions

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

security

Merge pull request #3793 from NixOS/pkgs/nfchacktools

2014-08-26 01:32:50 +02:00

system

Add di package

2014-08-28 14:16:11 +02:00

text

wgetpaste: 2.23 -> 2.25

2014-08-25 13:03:30 +02:00

typesetting

docbook2x: Add platforms so that it builds on hydra

2014-08-25 14:55:15 +02:00

video

Fix many package descriptions

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

virtualization

ec2-ami-tools: Update from 1.4.0.9 to 1.5.3

2014-08-05 01:25:16 +02:00

X11

Merge pull request #3771 from bjornfor/fix-package-descriptions

2014-08-25 10:00:01 +02:00