From d707a61ac2adbf9f902d250e16204a9a3df49341 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 23 Aug 2005 15:56:17 +0000 Subject: [PATCH] add nano svn path=/nixu/trunk/; revision=3670 --- boot/builder.sh | 4 +++- boot/default.nix | 8 ++++---- boot/env.sh | 2 +- fill-disk.sh | 4 ++-- make-disk.sh | 20 +++++++++++--------- pkgs.nix | 12 ++++++------ 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/boot/builder.sh b/boot/builder.sh index dce3250f090..1a94fb52d0f 100755 --- a/boot/builder.sh +++ b/boot/builder.sh @@ -10,7 +10,7 @@ for i in $boot $halt $login $env; do sed \ -e "s^@bash\@^$bash^g" \ -e "s^@coreutils\@^$coreutils^g" \ - -e "s^@findutils\@^$findutils^g" \ + -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \ -e "s^@utillinux\@^$utillinux^g" \ -e "s^@sysvinit\@^$sysvinit^g" \ -e "s^@e2fsprogs\@^$e2fsprogs^g" \ @@ -39,6 +39,8 @@ for i in $boot $halt $login $env; do -e "s^@grub\@^$grub^g" \ -e "s^@udev\@^$udev^g" \ -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \ + -e "s^@man\@^$man^g" \ + -e "s^@nano\@^$nano^g" \ -e "s^@out\@^$out^g" \ < $i > $dst chmod +x $dst diff --git a/boot/default.nix b/boot/default.nix index 0827f59d7bd..dc3632f8f70 100644 --- a/boot/default.nix +++ b/boot/default.nix @@ -1,8 +1,8 @@ -{ stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs +{ stdenv, kernel, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , gnutar, gzip, mingetty, grubWrapper, parted, module_init_tools, hotplug -, udev, dhcpWrapper}: +, udev, dhcpWrapper, man, nano}: derivation { name = "boot"; @@ -12,9 +12,9 @@ derivation { halt = ./halt.sh; login = ./login.sh; env = ./env.sh; - inherit stdenv kernel bash coreutils findutils utillinux sysvinit + inherit stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools - udev dhcpWrapper; + udev dhcpWrapper man nano; } diff --git a/boot/env.sh b/boot/env.sh index 84b8e7c7b3a..1f151ae93b3 100644 --- a/boot/env.sh +++ b/boot/env.sh @@ -1 +1 @@ -export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin +export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutilsWrapper@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin:@module_init_tools@/sbin:@dhcpWrapper@/sbin:@man@/bin:@nano@/bin diff --git a/fill-disk.sh b/fill-disk.sh index 9e7e11e4f2c..084295c4da8 100755 --- a/fill-disk.sh +++ b/fill-disk.sh @@ -1,6 +1,6 @@ #! @bash@/bin/sh -e -export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin +export PATH=@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin kernel=@kernel@ @@ -256,7 +256,7 @@ echo copying store #cp -fa $storepaths $root/nix/store #done) < /cdrom/mystorepaths -cp -fa /nix/store/* $root/nix/store +cp -fva /nix/store/* $root/nix/store #echo registering valid paths... #(while read storepath; do diff --git a/make-disk.sh b/make-disk.sh index ac626727b90..f3e149e080c 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -57,7 +57,7 @@ BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)) coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)) -findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutils' | $NIX_CMD_PATH/nix-instantiate -)) +findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -)) utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)) e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX_CMD_PATH/nix-instantiate -)) modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_tools' | $NIX_CMD_PATH/nix-instantiate -)) @@ -65,6 +65,7 @@ grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NI hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -)) udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -)) dhcp=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX_CMD_PATH/nix-instantiate -)) +nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -)) (while read storepath; do cp -fa --parents ${storepath} ${archivesDir} @@ -107,16 +108,17 @@ svn export ${nixpkgs} ${archivesDir}/pkgs echo copying packages from store #cp -fa --parents ${nixDeps} ${archivesDir} -cp -fau --parents ${utilLinux} ${archivesDir} -cp -fau --parents ${Grub} ${archivesDir} +cp -fvau --parents ${utilLinux} ${archivesDir} +cp -fvau --parents ${Grub} ${archivesDir} #cp -fau --parents ${gnuSed} ${archivesDir} #cp -fau --parents ${gnuGrep} ${archivesDir} -cp -fau --parents ${Kernel} ${archivesDir} -cp -fau --parents ${SysVinit} ${archivesDir} -cp -fau --parents ${BootPath} ${archivesDir} -cp -fau --parents ${hotplug} ${archivesDir} -cp -fau --parents ${udev} ${archivesDir} -cp -fau --parents ${dhcp} ${archivesDir} +cp -fvau --parents ${Kernel} ${archivesDir} +cp -fvau --parents ${SysVinit} ${archivesDir} +cp -fvau --parents ${BootPath} ${archivesDir} +cp -fvau --parents ${hotplug} ${archivesDir} +cp -fvau --parents ${udev} ${archivesDir} +cp -fvau --parents ${dhcp} ${archivesDir} +cp -fvau --parents ${nano} ${archivesDir} bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -))) diff --git a/pkgs.nix b/pkgs.nix index 874548e01f2..af8d61a3f36 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -1,20 +1,20 @@ rec { inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix) - stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs + stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty grubWrapper syslinux parted module_init_tools hotplug udev - dhcpWrapper; + dhcpWrapper man nano; - boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils + boot = (import ./boot) {inherit stdenv kernel bash coreutils findutilsWrapper utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty grubWrapper parted module_init_tools - hotplug udev dhcpWrapper;}; + hotplug udev dhcpWrapper man nano;}; init = (import ./init) {inherit stdenv bash coreutils utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted module_init_tools hotplug - dhcpWrapper;}; + dhcpWrapper man nano;}; - everything = [boot init sysvinit kernel]; + everything = [boot sysvinit kernel]; }