Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ...

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

2016-04-01 10:06:01 +02:00

..

config

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

hardware

opengl.extraPackages32: pkgsi686Linux in example

2016-03-26 00:50:56 +11:00

i18n/inputMethod

fcitx: show available engines in module description

2016-02-28 07:12:55 -06:00

installer

Merge master into closure-size

2016-03-08 09:58:19 +01:00

misc

dnscrypt-proxy service: use dynamic uid/gid

2016-03-24 17:14:22 +01:00

profiles

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

programs

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

security

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

services

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

system

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

tasks

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

testing

test-instrumentation.nix: Only clear $PAGER in the backdoor shell

2016-02-23 11:56:09 +01:00

virtualisation

Merge branch 'master' into closure-size

2016-04-01 10:06:01 +02:00

module-list.nix

Merge pull request #14175 from peterhoeg/tmux

2016-03-29 20:26:42 +00:00

rename.nix

services.xserver.startGnuPGAgent: remove obsolete NixOS option

2016-03-18 11:06:31 +01:00