svn path=/nixu/trunk/; revision=3353
This commit is contained in:
Armijn Hemel 2005-07-18 09:47:42 +00:00
parent c05605e316
commit 8122aebd19
5 changed files with 8 additions and 6 deletions

View File

@ -35,6 +35,7 @@ for i in $boot $halt $login $env; do
-e "s^@gzip\@^$gzip^g" \ -e "s^@gzip\@^$gzip^g" \
-e "s^@gcc\@^$gcc^g" \ -e "s^@gcc\@^$gcc^g" \
-e "s^@mingetty\@^$mingetty^g" \ -e "s^@mingetty\@^$mingetty^g" \
-e "s^@grub\@^$grub^g" \
-e "s^@out\@^$out^g" \ -e "s^@out\@^$out^g" \
< $i > $dst < $i > $dst
chmod +x $dst chmod +x $dst

View File

@ -1,7 +1,7 @@
{ stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs { stdenv, kernel, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip, mingetty}: , gnutar, gzip, mingetty, grub}:
derivation { derivation {
name = "boot"; name = "boot";
@ -14,5 +14,5 @@ derivation {
inherit stdenv kernel bash coreutils findutils utillinux sysvinit inherit stdenv kernel bash coreutils findutils utillinux sysvinit
e2fsprogs nettools nix subversion gcc wget which vim less screen e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils strace shadowutils iputils gnumake curl gnused openssh binutils strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingetty; gnutar gnugrep gzip mingetty grub;
} }

View File

@ -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 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

View File

@ -5,7 +5,7 @@ manifest=${archivesDir}/MANIFEST
nixpkgs=/nixpkgs2/trunk/pkgs nixpkgs=/nixpkgs2/trunk/pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
chmod -R +w ${archivesDir}/* chmod -f -R +w ${archivesDir}/*
rm -rf ${archivesDir}/* rm -rf ${archivesDir}/*
NIX_CMD_PATH=/nix/bin NIX_CMD_PATH=/nix/bin

View File

@ -2,12 +2,13 @@ rec {
inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix) inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix)
stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
nettools nix subversion gcc wget which vim less screen openssh binutils nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty; strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingetty grub;
boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
less screen openssh binutils strace shadowutils iputils gnumake curl less screen openssh binutils strace shadowutils iputils gnumake curl
gnused gnutar gnugrep gzip mingetty;}; gnused gnutar gnugrep gzip mingetty grub;};
everything = [boot sysvinit]; everything = [boot sysvinit];
} }