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

svn path=/nixos/trunk/; revision=7786

Browse Source
This commit is contained in:
Eelco Dolstra 2007-01-23 20:09:06 +00:00
parent 241b28d101
commit 0685f24957
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration/rescue-cd.nix
View File

@ -1,7 +1,7 @@
rec { rec {
nixpkgsRel = "nixpkgs-0.11pre7628"; nixpkgsRel = "nixpkgs-0.11pre7785";
configuration = { configuration = {
@ -106,7 +106,7 @@ rec {
# Get a recent copy of Nixpkgs. # Get a recent copy of Nixpkgs.
nixpkgsTarball = pkgs.fetchurl { nixpkgsTarball = pkgs.fetchurl {
url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2"; url = configuration.installer.nixpkgsURL + "/" + nixpkgsRel + ".tar.bz2";
md5 = "e7fe1793e69ff5072eb5987e7b7ccd47"; md5 = "0f554f092d94cc2cb7fe1e5c09f26adc";
}; };

4
installer/nixos-installer.sh
View File

@ -20,7 +20,7 @@ nixosDir="$2"
configuration="$3" configuration="$3"
if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then if test -z "$mountPoint" -o -z "$nixosDir" -o -z "$configuration"; then
echo "Syntax: installer.sh <targetRootDir> <nixosDir> <configuration>" echo "Syntax: nixos-installer.sh <targetRootDir> <nixosDir> <configuration>"
exit 1 exit 1
fi fi
@ -117,7 +117,7 @@ cp /etc/resolv.conf $mountPoint/etc/
# the CD can be copied directly. # the CD can be copied directly.
echo "registering substitutes to speed up builds..." echo "registering substitutes to speed up builds..."
chroot $mountPoint @nix@/bin/nix-store --clear-substitutes chroot $mountPoint @nix@/bin/nix-store --clear-substitutes
chroot $mountPoint @nix@/bin/nix-pull /mnt/MANIFEST chroot $mountPoint @nix@/bin/nix-pull file:///mnt/MANIFEST
rm -f $mountPoint/tmp/inst-store rm -f $mountPoint/tmp/inst-store
ln -s /mnt/nix/store $mountPoint/tmp/inst-store ln -s /mnt/nix/store $mountPoint/tmp/inst-store

2
upstart-jobs/swraid.nix
View File

@ -2,7 +2,7 @@
let let
tempConf = "/var/state/mdadm.conf"; tempConf = "/var/run/mdadm.conf";
in in