* Move the installer tools to modules/installer/tools.

svn path=/nixos/branches/modular-nixos/; revision=15788

installer/default.nix

@@ -1,47 +0,0 @@
-{pkgs, config}:
-
-let
-
-  nix = config.environment.nix;
-
-  makeProg = args: pkgs.substituteAll (args // {
-    dir = "bin";
-    isExecutable = true;
-  });
-
-in
-
-{
-
-  nixosInstall = makeProg {
-    name = "nixos-install";
-    src = ./nixos-install.sh;
-
-    inherit (pkgs) perl;
-    inherit nix;
-    nixpkgsURL = config.installer.nixpkgsURL;
-
-    pathsFromGraph = "${pkgs.path}/build-support/kernel/paths-from-graph.pl";
-
-    nixClosure = pkgs.runCommand "closure"
-      {exportReferencesGraph = ["refs" nix];}
-      "cp refs $out";
-  };
-
-  nixosRebuild = makeProg {
-    name = "nixos-rebuild";
-    src = ./nixos-rebuild.sh;
-  };
-
-  nixosGenSeccureKeys = makeProg {
-    name = "nixos-gen-seccure-keys";
-    src = ./nixos-gen-seccure-keys.sh;
-  };
-
-  nixosHardwareScan = makeProg {
-    name = "nixos-hardware-scan";
-    src = ./nixos-hardware-scan.pl;
-    inherit (pkgs) perl;
-  };
-
-}

modules/config/system-path.nix

@@ -7,20 +7,10 @@ with pkgs.lib;
 
 let
 
-  # NixOS installation/updating tools.
-  nixosTools = import ../../installer {
-    inherit pkgs config;
-  };
-
-  
   systemPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
       config.environment.nix
-      nixosTools.nixosInstall
-      nixosTools.nixosRebuild
-      nixosTools.nixosHardwareScan
-      nixosTools.nixosGenSeccureKeys
       pkgs.acl
       pkgs.attr
       pkgs.bashInteractive # bash with ncurses support

modules/legacy.nix

@@ -1,6 +1,5 @@
 {
   require = [
-    ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/pcmcia.nix
   ];

modules/module-list.nix

@@ -10,7 +10,8 @@
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
   ./installer/grub/grub.nix
-  ./installer/nixos-checkout.nix
+  ./installer/tools/nixos-checkout.nix
+  ./installer/tools/tools.nix
   ./legacy.nix
   ./misc/assertions.nix
   ./programs/bash/bash.nix

system/nixos-installer.nix

@@ -1,41 +0,0 @@
-{pkgs, config, ...}:
-
-###### interface
-let
-  inherit (pkgs.lib) mkOption mkIf;
-
-  options = {
-    installer = {
-      nixpkgsURL = mkOption {
-        default = "";
-        example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
-        description = "
-          URL of the Nixpkgs distribution to use when building the
-          installation CD.
-        ";
-      };
-
-      manifests = mkOption {
-        default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
-        example =
-          [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
-            http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
-          ];
-        description = "
-          URLs of manifests to be downloaded when you run
-          <command>nixos-rebuild</command> to speed up builds.
-        ";
-      };
-    };
-  };
-
-
-in
-
-###### implementation
-
-{
-  require = [
-    options
-  ];
-}