From f36643b6c29bd83c4508d2509e9a914c4b0dc687 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 29 May 2009 12:41:29 +0000 Subject: [PATCH] * Move the installer tools to modules/installer/tools. svn path=/nixos/branches/modular-nixos/; revision=15788 --- installer/default.nix | 47 ------------------- modules/config/system-path.nix | 10 ---- .../installer/{ => tools}/nixos-checkout.nix | 0 .../tools}/nixos-gen-seccure-keys.sh | 0 .../installer/tools}/nixos-hardware-scan.pl | 0 .../installer/tools}/nixos-install.sh | 0 .../installer/tools}/nixos-rebuild.sh | 0 modules/legacy.nix | 1 - modules/module-list.nix | 3 +- system/nixos-installer.nix | 41 ---------------- 10 files changed, 2 insertions(+), 100 deletions(-) delete mode 100644 installer/default.nix rename modules/installer/{ => tools}/nixos-checkout.nix (100%) rename {installer => modules/installer/tools}/nixos-gen-seccure-keys.sh (100%) rename {installer => modules/installer/tools}/nixos-hardware-scan.pl (100%) rename {installer => modules/installer/tools}/nixos-install.sh (100%) rename {installer => modules/installer/tools}/nixos-rebuild.sh (100%) delete mode 100644 system/nixos-installer.nix diff --git a/installer/default.nix b/installer/default.nix deleted file mode 100644 index 214c5e0a164..00000000000 --- a/installer/default.nix +++ /dev/null @@ -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; - }; - -} diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix index c8f1f787993..e85382606da 100644 --- a/modules/config/system-path.nix +++ b/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 diff --git a/modules/installer/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix similarity index 100% rename from modules/installer/nixos-checkout.nix rename to modules/installer/tools/nixos-checkout.nix diff --git a/installer/nixos-gen-seccure-keys.sh b/modules/installer/tools/nixos-gen-seccure-keys.sh similarity index 100% rename from installer/nixos-gen-seccure-keys.sh rename to modules/installer/tools/nixos-gen-seccure-keys.sh diff --git a/installer/nixos-hardware-scan.pl b/modules/installer/tools/nixos-hardware-scan.pl similarity index 100% rename from installer/nixos-hardware-scan.pl rename to modules/installer/tools/nixos-hardware-scan.pl diff --git a/installer/nixos-install.sh b/modules/installer/tools/nixos-install.sh similarity index 100% rename from installer/nixos-install.sh rename to modules/installer/tools/nixos-install.sh diff --git a/installer/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh similarity index 100% rename from installer/nixos-rebuild.sh rename to modules/installer/tools/nixos-rebuild.sh diff --git a/modules/legacy.nix b/modules/legacy.nix index a4da194288a..245b78384ac 100644 --- a/modules/legacy.nix +++ b/modules/legacy.nix @@ -1,6 +1,5 @@ { require = [ - ../system/nixos-installer.nix ../upstart-jobs/cron/locate.nix ../upstart-jobs/pcmcia.nix ]; diff --git a/modules/module-list.nix b/modules/module-list.nix index 9319fd703d8..85d904493a4 100644 --- a/modules/module-list.nix +++ b/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 diff --git a/system/nixos-installer.nix b/system/nixos-installer.nix deleted file mode 100644 index 046a9343309..00000000000 --- a/system/nixos-installer.nix +++ /dev/null @@ -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 - nixos-rebuild to speed up builds. - "; - }; - }; - }; - - -in - -###### implementation - -{ - require = [ - options - ]; -}