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

* Use tar 1.15.1 for now (1.16 is buggy). 

* Honour $TMPDIR (my /tmp is full).

svn path=/nixu/trunk/; revision=6918
This commit is contained in:
Eelco Dolstra 2006-10-31 17:39:55 +00:00
parent 319489bf8b
commit c55460a027
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make-disk.sh
View File

@ -1,12 +1,16 @@
#! /bin/sh -e #! /bin/sh -e
set -x
if test -z "$TMPDIR"; then export TMPDIR=/tmp; fi
# deps is an array # deps is an array
declare -a deps declare -a deps
NIXSTORE=`which nix-store` NIXSTORE=`which nix-store`
NIXINSTANTIATE=`which nix-instantiate` NIXINSTANTIATE=`which nix-instantiate`
coreutils=$($NIXSTORE -r $(echo '(import ./pkgs.nix).coreutils' | $NIXINSTANTIATE -)) coreutils=$(nix-store -r $(nix-instantiate ./pkgs.nix -A coreutils))
# determine where we can find the Nix binaries # determine where we can find the Nix binaries
NIX=$($coreutils/bin/dirname $(which nix-store)) NIX=$($coreutils/bin/dirname $(which nix-store))
@ -15,7 +19,7 @@ NIX=$($coreutils/bin/dirname $(which nix-store))
mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -)) mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -))
gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)) gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -)) gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar151' | $NIX/nix-instantiate -))
cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -)) cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -)) gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -)) cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
@ -23,15 +27,15 @@ cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiat
archivesDir=$($mktemp/bin/mktemp -d) archivesDir=$($mktemp/bin/mktemp -d)
archivesDir2=$($mktemp/bin/mktemp -d) archivesDir2=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
nixpkgs=/nixpkgs/trunk/pkgs nixpkgs=./pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
ramdisk_login=$archivesDir/scripts/ramdisk-login.sh ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
login_script=$archivesDir/scripts/login.sh login_script=$archivesDir/scripts/login.sh
storePaths=$archivesDir/mystorepaths storePaths=$archivesDir/mystorepaths
narStorePaths=$archivesDir/narstorepaths narStorePaths=$archivesDir/narstorepaths
validatePaths=$archivesDir/validatepaths validatePaths=$archivesDir/validatepaths
bootiso=/tmp/nixos.iso bootiso=$TMPDIR/nixos.iso
initrd=/tmp/initram.img initrd=$TMPDIR/initram.img
initdir=${archivesDir}/initdir initdir=${archivesDir}/initdir
initscript=$archivesDir/scripts/init.sh initscript=$archivesDir/scripts/init.sh

2
pkgs.nix
View File

@ -4,7 +4,7 @@ rec {
findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
e2fsprogs nettools nix subversion gcc wget which vim less screen e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted gnutar gnutar151 gnugrep gzip mingettyWrapper grubWrapper syslinux parted
module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet; eject sysklogd mktemp cdrtools cpio busybox mkinitrd ncursesDiet;