public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove deprecated notation in tools.nix.

Browse Source 
svn path=/nixos/trunk/; revision=23630
This commit is contained in:
Nicolas Pierron 2010-09-03 19:10:54 +00:00
parent 9e04f67b3d
commit 1f69bc4b9d
1 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
modules/installer/tools/tools.nix
View File

@ -4,35 +4,6 @@
{config, pkgs, ...}: {config, pkgs, ...}:
let 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 ### implementation
makeProg = args: pkgs.substituteAll (args // { makeProg = args: pkgs.substituteAll (args // {
@ -119,23 +90,48 @@ let
in in
{ {
require = options; options = {
environment.systemPackages = installer.nixpkgsURL = pkgs.lib.mkOption {
[ nixosInstall default = "";
nixosRebuild example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
nixosHardwareScan description = ''
nixosGenSeccureKeys URL of the Nixpkgs distribution to use when building the
nixosOption installation CD.
'';
};
installer2.runInChroot installer.manifests = pkgs.lib.mkOption {
installer2.nixosPrepareInstall 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.
'';
};
system.build = { };
inherit nixosInstall;
# expose scripts config = {
inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive; environment.systemPackages =
[ nixosInstall
nixosRebuild
nixosHardwareScan
nixosGenSeccureKeys
nixosOption
installer2.runInChroot
installer2.nixosPrepareInstall
];
system.build = {
inherit nixosInstall;
# expose scripts
inherit (installer2) nixosPrepareInstall runInChroot nixosBootstrap minimalInstallArchive;
};
}; };
} }