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

..

cloud-init.nix

Added the cloud-init service

2014-12-03 13:22:13 +01:00

dbus.nix

treewide: Mass replace 'dbus_daemon}/lib' to refer the 'lib' output

2016-01-24 10:03:34 +02:00

kerberos.nix

jobs -> systemd.services

2016-01-07 06:39:06 +00:00

nscd.conf

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

nscd.nix

Merge commit staging+systemd into closure-size

2015-10-03 13:33:37 +02:00

uptimed.nix

nixos: uptimed - rewrite and harden a bit (#7220)

2016-01-23 19:28:01 +00:00