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

add more packages that are necessary for a complete build

Browse Source 
svn path=/nixu/trunk/; revision=1246
This commit is contained in:
Armijn Hemel 2004-08-06 17:22:24 +00:00
parent d40375a0bf
commit 511b3fd83f
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/builder.sh
View File

@ -28,6 +28,11 @@ for i in $boot $halt $login $env; do
-e "s^@shadowutils\@^$shadowutils^g" \ -e "s^@shadowutils\@^$shadowutils^g" \
-e "s^@iputils\@^$iputils^g" \ -e "s^@iputils\@^$iputils^g" \
-e "s^@gnumake\@^$gnumake^g" \ -e "s^@gnumake\@^$gnumake^g" \
-e "s^@curl\@^$curl^g" \
-e "s^@gnused\@^$gnused^g" \
-e "s^@gnutar\@^$gnutar^g" \
-e "s^@gnugrep\@^$gnugrep^g" \
-e "s^@gzip\@^$gzip^g" \
-e "s^@out\@^$out^g" \ -e "s^@out\@^$out^g" \
< $i > $dst < $i > $dst
chmod +x $dst chmod +x $dst

6
boot/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, bash, coreutils, findutils, utillinux, sysvinit, e2fsprogs { stdenv, 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}: , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
, gnutar, gzip}:
derivation { derivation {
name = "boot"; name = "boot";
@ -12,5 +13,6 @@ derivation {
env = ./env.sh; env = ./env.sh;
inherit stdenv bash coreutils findutils utillinux sysvinit inherit stdenv 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; openssh binutils strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip;
} }

2
boot/env.sh
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 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

5
fill-disk.sh
View File

@ -14,7 +14,7 @@ make_dir() {
touch_file() { touch_file() {
name=$1 name=$1
echo creating $name... echo touching $name...
if ! test -d $root/$name; then touch $root/$name; fi if ! test -d $root/$name; then touch $root/$name; fi
} }
root=/tmp/mnt root=/tmp/mnt
@ -22,11 +22,12 @@ root=/tmp/mnt
echo mounting... echo mounting...
mount -t ext2 /dev/discs/disc0/disc $root mount -t ext2 /dev/discs/disc0/disc $root
make_dir 00755 /bin
make_dir 00755 /dev make_dir 00755 /dev
make_dir 00755 /proc make_dir 00755 /proc
make_dir 01777 /tmp make_dir 01777 /tmp
make_dir 00755 /etc # global non-constant configuration make_dir 00755 /etc # global non-constant configuration
make_dir 00755 /etc-secret # global non-constant configuration make_dir 00755 /etc-secret
make_dir 00755 /var make_dir 00755 /var
make_dir 00755 /nix make_dir 00755 /nix
make_dir 00755 /nix/store make_dir 00755 /nix/store

2
make-disk.sh
View File

@ -1,7 +1,7 @@
#! /bin/sh -e #! /bin/sh -e
image=/tmp/disk.img image=/tmp/disk.img
size=$(expr 256 \* 1024 \* 1024) size=$(expr 2048 \* 1024 \* 1024)
storePaths=/tmp/storepaths storePaths=/tmp/storepaths
successors=/tmp/successors successors=/tmp/successors

7
pkgs.nix
View File

@ -1,10 +1,13 @@
rec { rec {
inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix) inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix)
stdenv bash coreutils findutils utillinux sysvinit e2fsprogs stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake; nettools nix subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;
boot = (import ./boot) {inherit stdenv bash coreutils findutils boot = (import ./boot) {inherit stdenv bash coreutils findutils
utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim less screen openssh binutils strace shadowutils iputils gnumake;}; utillinux sysvinit e2fsprogs nettools nix subversion gcc wget which vim
less screen openssh binutils strace shadowutils iputils gnumake curl
gnused gnutar gnugrep gzip;};
everything = [boot sysvinit]; everything = [boot sysvinit];
} }