1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 16:46:09 +00:00
nixpkgs/nixos/modules/installer/tools
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +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 Merge recent master into staging 2014-08-30 10:04:02 +02:00
nixos-install.sh nixos-install.sh: added --root parameter 2014-08-24 17:40:20 +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 nixos-generate-config: Detect btrfs subvolumes 2014-08-28 13:35:37 -07:00