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

* Remove some references to the services tree.

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=16015
This commit is contained in:
Eelco Dolstra 2009-06-22 10:01:14 +00:00
parent da77a6437f
commit fc3eecad91
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/installer/tools/nixos-checkout.nix
View File

@ -41,8 +41,7 @@ let
from working directory dirname from working directory dirname
<replaceable>target</replaceable> and should create the <replaceable>target</replaceable> and should create the
directory directory
<filename><replaceable>dir</replaceable></filename>. (<command>git <filename><replaceable>dir</replaceable></filename>. For
clone url nixos/nixpkgs/services</command> should do) For
the executables used see <option>repoTypes</option>. the executables used see <option>repoTypes</option>.
''; '';
}; };
@ -52,11 +51,6 @@ let
description = "same as <option>repos.nixos</option>"; description = "same as <option>repos.nixos</option>";
}; };
installer.repos.services = mkOption {
default = [ { type = "svn"; } ];
description = "same as <option>repos.nixos</option>";
};
installer.repoTypes = mkOption { installer.repoTypes = mkOption {
default = { default = {
svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; }; svn = { valid = "[ -d .svn ]"; env = [ pkgs.coreutils pkgs.subversion ]; };

8
modules/installer/tools/nixos-install.sh
View File

@ -169,20 +169,12 @@ if test -e $targetNixpkgs; then
mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp mv $targetNixpkgs $targetNixpkgs.backup-$backupTimestamp
fi fi
targetServices=$mountPoint/etc/nixos/services
if test -e $targetServices; then
mv $targetServices $targetServices.backup-$backupTimestamp
fi
# Copy the NixOS/Nixpkgs sources to the target. # Copy the NixOS/Nixpkgs sources to the target.
cp -prd $NIXOS $targetNixos cp -prd $NIXOS $targetNixos
if test -e /etc/nixos/nixpkgs; then if test -e /etc/nixos/nixpkgs; then
cp -prd /etc/nixos/nixpkgs $targetNixpkgs cp -prd /etc/nixos/nixpkgs $targetNixpkgs
fi fi
if test -e /etc/nixos/services; then
cp -prd /etc/nixos/services $targetServices
fi
# Grub needs an mtab. # Grub needs an mtab.