Vladimír Čunát d4e9fd2a90 Merge recent master into staging ... Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix		2014-08-21 15:09:31 +02:00
..
nixos-build-vms	nixos-build-vms: Fix function invocation to test driver	2014-06-09 13:36:26 +02:00
get-version-suffix	Mark builds from git explicitly	2014-05-01 15:05:14 +02:00
nixos-checkout.nix	Rewrite ‘with pkgs.lib’ -> ‘with lib’	2014-04-14 16:26:48 +02:00
nixos-generate-config.pl	Add user attribute isNormalUser	2014-08-15 02:16:04 +02:00
nixos-install.sh	nixos-install: Fix copying symlink resolv.conf.	2014-08-17 06:46:41 +02:00
nixos-option.sh	typo: occured -> occurred	2014-03-07 19:39:55 +01:00
nixos-rebuild.sh	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
nixos-version.sh	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
tools.nix	Get all lib functions from lib, not pkgs.lib, in modules	2014-07-02 12:28:18 -04:00