Robin Gloster 1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-21 00:56:43 +00:00

..

config

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-19 10:37:02 +00:00

hardware

nixos ati_unfree: auto-switch xorg to fglrxComat

2016-05-23 10:12:44 +02:00

i18n/input-method

fcitx: refactor (#16858)

2016-07-11 17:50:22 +02:00

installer

nixos-version: fix syntax error and add -h (#16906)

2016-07-13 09:11:32 +02:00

misc

smokeping: init at 2.6.11 (#17090)

2016-07-21 01:07:59 +02:00

profiles

documentation: fix start display-manager command

2016-07-04 10:25:31 +02:00

programs

nixos: init programs.xonsh

2016-07-21 00:55:36 +02:00

security

grsecurity module: tweak lockTunables option description

2016-07-16 11:11:35 +02:00

services

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-21 00:56:43 +00:00

system

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-21 00:56:43 +00:00

tasks

Merge pull request #6846 from wizeman/u/zfs-auto-snap-flags

2016-07-21 01:53:11 +02:00

testing

KDE test: Bump kdm start timeout

2016-05-27 11:22:27 +02:00

virtualisation

virtualbox: fix virtualbox guest additions (#16964)

2016-07-19 13:55:44 +02:00

module-list.nix

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-21 00:56:43 +00:00

rename.nix

nixos: rewrite the grsecurity module

2016-06-14 03:38:12 +02:00