Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

config

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

hardware

nixos xserver: remove vaapiDrivers

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

installer

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

misc

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

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

profiles

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

programs

Fix some references to deprecated /etc/ssl/certs/ca-bundle.crt

2016-01-29 02:32:05 +01:00

security

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

services

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

system

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

tasks

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

testing

NixOS tests: Increase hung_task_timeout_secs

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

virtualisation

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00

module-list.nix

nixos: add module for rmilter

2016-01-16 15:12:30 +02:00

rename.nix

nixos xserver: remove vaapiDrivers

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