Vladimír Čunát 87c3c0e885 Merge master into #2129 ...

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix

2014-08-12 19:24:08 +02:00

..

applications

Merge #3408: licenses: prefer spdx.org, improve docs

2014-08-12 19:08:53 +02:00

build-support

Fixed deterministicness of fetchgit with leaveDotGit

2014-08-10 16:25:29 +02:00

data

…

desktops

gdm: Add very experimental display manager

2014-08-12 11:23:42 +02:00

development

Merge #3408: licenses: prefer spdx.org, improve docs

2014-08-12 19:08:53 +02:00

games

haskell-Allure: add version 0.4.99.0

2014-08-12 12:37:44 +02:00

misc

Make platforms.allBut accept a list rather than a single platform

2014-08-09 12:31:33 +02:00

os-specific

ldm: Bump to 0.5.

2014-08-12 13:52:48 +02:00

servers

…

shells

…

stdenv

…

test

…

tools

Merge master into #2129

2014-08-12 19:24:08 +02:00

top-level

Merge master into #2129

2014-08-12 19:24:08 +02:00