Author: NicolasPierron
Date: Fri Sep 3 19:10:54 2010
New Revision: 23630
URL: https://svn.nixos.org/websvn/nix/?rev=23630&sc=1
Log:
Remove deprecated notation in tools.nix.
Modified:
nixos/trunk/modules/installer/tools/tools.nix
Modified: nixos/trunk/modules/installer/tools/tools.nix
==============================================================================
--- nixos/trunk/modules/installer/tools/tools.nix Fri Sep 3 19:10:50
2010 (r23629)
+++ nixos/trunk/modules/installer/tools/tools.nix Fri Sep 3 19:10:54
2010 (r23630)
@@ -4,35 +4,6 @@
{config, pkgs, ...}:
let
-
- ### interface
-
- options = {
-
- installer.nixpkgsURL = pkgs.lib.mkOption {
- default = "";
- example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
- description = ''
- URL of the Nixpkgs distribution to use when building the
- installation CD.
- '';
- };
-
- installer.manifests = pkgs.lib.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.
- '';
- };
-
- };
-
-
### implementation
makeProg = args: pkgs.substituteAll (args // {
@@ -119,23 +90,48 @@
in
{
- require = options;
+ options = {
+
+ installer.nixpkgsURL = pkgs.lib.mkOption {
+ default = "";
+ example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
+ description = ''
+ URL of the Nixpkgs distribution to use when building the
+ installation CD.
+ '';
+ };
+
+ installer.manifests = pkgs.lib.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.
+ '';
+ };
+
+ };
- environment.systemPackages =
- [ nixosInstall
- nixosRebuild
- nixosHardwareScan
- nixosGenSeccureKeys
- nixosOption
-
- installer2.runInChroot
- installer2.nixosPrepareInstall
- ];
+ config = {
+ environment.systemPackages =
+ [ nixosInstall
+ nixosRebuild
+ nixosHardwareScan
+ nixosGenSeccureKeys
+ nixosOption
+
+ installer2.runInChroot
+ installer2.nixosPrepareInstall
+ ];
- system.build = {
- inherit nixosInstall;
+ system.build = {
+ inherit nixosInstall;
- # expose scripts
- inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap
minimalInstallArchive;
+ # expose scripts
+ inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap
minimalInstallArchive;
+ };
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
