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

also use our own cpio. Make sure we don't just query nix expressions, but

Browse Source 
actually realize them as well. D'oh!

svn path=/nixu/trunk/; revision=5566
This commit is contained in:
Armijn Hemel 2006-07-03 23:16:44 +00:00
parent 8a14c8d886
commit 45a2be1fbe
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make-disk.sh
View File

@ -12,8 +12,9 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
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).gnutar' | $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 -))
coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -)) coreutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
gzip=$($NIX/nix-store -q $(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 -))
archivesDir=$($mktemp/bin/mktemp -d) archivesDir=$($mktemp/bin/mktemp -d)
manifest=${archivesDir}/MANIFEST manifest=${archivesDir}/MANIFEST
@ -249,7 +250,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
$coreutils/bin/touch ${archivesDir}/NIXOS $coreutils/bin/touch ${archivesDir}/NIXOS
(cd ${initdir}; find . |cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd} (cd ${initdir}; find . |$cpio/bin/cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
$coreutils/bin/chmod -f -R +w ${initdir}/* $coreutils/bin/chmod -f -R +w ${initdir}/*
$coreutils/bin/rm -rf ${initdir} $coreutils/bin/rm -rf ${initdir}

2
pkgs.nix
View File

@ -5,7 +5,7 @@ rec {
nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools; dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools cpio;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim