Vladimír Čunát a115bff08c Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

..

config

Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

hardware

nixos xserver: remove vaapiDrivers

2016-01-26 13:42:40 +03:00

installer

Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

misc

nixos: update-locatedb - harden via systemd (#7220)

2016-01-23 20:44:30 +00:00

profiles

wpa_supplicant service: jobs -> systemd.services

2016-01-06 03:58:39 +00:00

programs

Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

security

Configure a default trust store for openssl

2016-02-03 12:42:01 +01:00

services

Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

system

filesystems: use list of strings for fs options

2016-02-06 19:48:30 +00:00

tasks

filesystems: use list of strings for fs options

2016-02-06 19:48:30 +00:00

testing

NixOS tests: Increase hung_task_timeout_secs

2016-01-04 16:53:42 +01:00

virtualisation

Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00

module-list.nix

Merge pull request #12560 from tvestelind/haka

2016-02-06 20:32:39 +01:00

rename.nix

nixos xserver: remove vaapiDrivers

2016-01-26 13:42:40 +03:00