Oliver Charles 42ae633445 Merge branch 'master' into dbus-switch-to-configuration ...

Conflicts:
	nixos/modules/system/activation/switch-to-configuration.pl

2014-04-20 19:17:05 +01:00

..

activation-script.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

no-clone.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

switch-to-configuration.pl

Merge branch 'master' into dbus-switch-to-configuration

2014-04-20 19:17:05 +01:00

top-level.nix

Merge branch 'master' into dbus-switch-to-configuration

2014-04-20 19:17:05 +01:00