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

small cleanups, also move to newer Nix

Browse Source 
svn path=/nixu/trunk/; revision=5524
This commit is contained in:
Armijn Hemel 2006-06-24 22:14:43 +00:00
parent 2a304add0b
commit 02cf649af6
3 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fill-disk.sh
View File

@ -237,7 +237,7 @@ export NIX_DATA_DIR=$root/nix/share
export NIX_LOG_DIR=$root/nix/log/nix export NIX_LOG_DIR=$root/nix/log/nix
export NIX_STATE_DIR=$root/nix/var/nix export NIX_STATE_DIR=$root/nix/var/nix
export NIX_CONF_DIR=$root/nix/etc export NIX_CONF_DIR=$root/nix/etc
NIX_CMD_PATH=@nix@/bin NIX=@nix@/bin
#echo bringing up networking... #echo bringing up networking...
@ -246,10 +246,10 @@ NIX_CMD_PATH=@nix@/bin
#echo "NIC: $nic" #echo "NIC: $nic"
echo initialising Nix DB... echo initialising Nix DB...
$NIX_CMD_PATH/nix-store --init $NIX/nix-store --init
echo verifying Nix DB... echo verifying Nix DB...
$NIX_CMD_PATH/nix-store --verify $NIX/nix-store --verify
echo copying nixpkgs... echo copying nixpkgs...
#cp -fLa /cdrom/pkgs $root/nixpkgs/trunk #cp -fLa /cdrom/pkgs $root/nixpkgs/trunk
@ -259,7 +259,7 @@ make_dir 0755 /tmp/scripts
cp -fa /cdrom/scripts $root/tmp cp -fa /cdrom/scripts $root/tmp
#echo adding manifest #echo adding manifest
#$NIX_CMD_PATH/nix-pull $manifest #$NIX/nix-pull $manifest
echo adding packages echo adding packages
@ -269,15 +269,15 @@ unset NIX_LOG_DIR
unset NIX_STATE_DIR unset NIX_STATE_DIR
unset NIX_CONF_DIR unset NIX_CONF_DIR
storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -v -v -) storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).kernel' | $NIX/nix-instantiate -v -v -)
#storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -) #storeExpr=$(echo '(import /tmp/scripts/pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
#storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -) #storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -v -v -)
#$NIX_CMD_PATH/nix-store -r $storeExpr #$NIX/nix-store -r $storeExpr
echo $storeExpr > $root/tmp/storeExpr echo $storeExpr > $root/tmp/storeExpr
cp /cdrom/mystorepaths $root/tmp cp /cdrom/mystorepaths $root/tmp
#storeExpr2=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $storeExpr)) #storeExpr2=$($NIX/nix-store -qR $($NIX/nix-store -r $storeExpr))
#echo storeExpr $storeExpr #echo storeExpr $storeExpr
#echo $($NIX_CMD_PATH/nix-store -qR --include-outputs $storeExpr) #echo $($NIX/nix-store -qR --include-outputs $storeExpr)
echo copying store echo copying store
@ -286,9 +286,9 @@ tar cf - /nix/store | tar --directory=$root -xvf -
echo registering valid paths... echo registering valid paths...
$NIX_CMD_PATH/nix-store --register-validity < $root/tmp/mystorepaths $NIX/nix-store --register-validity < $root/tmp/mystorepaths
$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
$NIX_CMD_PATH/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
echo setting init symlink... echo setting init symlink...
rm -f $root/init rm -f $root/init

92
make-disk.sh
View File

@ -15,34 +15,35 @@ initrd=/tmp/initram.img
initdir=${archivesDir}/initdir initdir=${archivesDir}/initdir
initscript=$archivesDir/scripts/init.sh initscript=$archivesDir/scripts/init.sh
NIX_CMD_PATH=$(dirname $(which nix-store)) # determine where we can find the Nix binaries
NIX=$(dirname $(which nix-store))
storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -))) storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)) #$NIX/nix-push --copy $archivesDir $manifest $($NIX/nix-store -r $storeExpr) $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
# Location of sysvinit? # Location of sysvinit?
sysvinitPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)) sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
# Location of Nix boot scripts? # Location of Nix boot scripts?
bootPath=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)) bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) nix=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
syslinux=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -)) syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)) kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) #nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
#nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) #nixDeps=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)))
#echo $($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))) >> $storePaths #echo $($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))) >> $storePaths
#$NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)) >> $storePaths #$NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -)) >> $storePaths
for i in $storeExpr for i in $storeExpr
do do
echo $i >> $storePaths echo $i >> $storePaths
echo '' >> $storePaths echo '' >> $storePaths
deps=$($NIX_CMD_PATH/nix-store -q --references $i) deps=$($NIX/nix-store -q --references $i)
pkgs=$(echo $deps | wc -w) pkgs=$(echo $deps | wc -w)
echo $pkgs >> $storePaths echo $pkgs >> $storePaths
for j in $deps for j in $deps
@ -53,36 +54,39 @@ do
tar -cf - $i | tar --directory=$archivesDir -xf - tar -cf - $i | tar --directory=$archivesDir -xf -
done done
utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX_CMD_PATH/nix-instantiate -)) utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
coreUtilsDiet=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -))) coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
e2fsProgs=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)))
modUtils=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -)))
Grub=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)))
#gnuSed=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -)))
#gnuGrep=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)))
Kernel=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)))
SysVinit=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)))
BootPath=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)))
bashGlibc=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)) ## temporarily normal e2fsprogs until I can get it to build with dietlibc
bash=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX_CMD_PATH/nix-instantiate -)) #e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)))
coreutilsdiet=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX_CMD_PATH/nix-instantiate -)) e2fsProgs=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)))
coreutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX_CMD_PATH/nix-instantiate -)) modUtils=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)))
findutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX_CMD_PATH/nix-instantiate -)) Grub=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)))
utillinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX_CMD_PATH/nix-instantiate -)) #gnuSed=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)))
e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX_CMD_PATH/nix-instantiate -)) #gnuGrep=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -)))
modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX_CMD_PATH/nix-instantiate -)) Kernel=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)))
grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -)) SysVinit=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -)))
mingettyWrapper=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX_CMD_PATH/nix-instantiate -)) BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/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 -)) bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
nano=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX_CMD_PATH/nix-instantiate -)) bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -)) coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
which=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX_CMD_PATH/nix-instantiate -)) coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
gnutar=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX_CMD_PATH/nix-instantiate -)) findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
eject=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX_CMD_PATH/nix-instantiate -)) utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX_CMD_PATH/nix-instantiate -)) e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
#kudzu=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX_CMD_PATH/nix-instantiate -)) modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
udev=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX/nix-instantiate -))
dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
sysklogd=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $NIX/nix-instantiate -))
#kudzu=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kudzu' | $NIX/nix-instantiate -))
#(while read storepath; do #(while read storepath; do
#cp -fa --parents ${storepath} ${archivesDir} #cp -fa --parents ${storepath} ${archivesDir}
@ -92,7 +96,7 @@ sysklogd=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).sysklogd' | $N
#for i in $utilLinux; do #for i in $utilLinux; do
# echo i $i # echo i $i
# deps=( $($NIX_CMD_PATH/nix-store -q --references $i) ) # deps=( $($NIX/nix-store -q --references $i) )
# echo length ${#deps[@]} # echo length ${#deps[@]}
# if test "${#deps[@]}" = 0 # if test "${#deps[@]}" = 0
# then # then
@ -173,7 +177,7 @@ mv $fill_disk.tmp $fill_disk
sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \ sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@bootPath\@^$bootPath^g" \ -e "s^@bootPath\@^$bootPath^g" \
-e "s^@NIX_CMD_PATH\@^$nix^g" \ -e "s^@NIX\@^$nix^g" \
-e "s^@bash\@^$bash^g" \ -e "s^@bash\@^$bash^g" \
-e "s^@findutils\@^$findutils^g" \ -e "s^@findutils\@^$findutils^g" \
-e "s^@coreutilsdiet\@^$coreutilsdiet^g" \ -e "s^@coreutilsdiet\@^$coreutilsdiet^g" \

12
pkgs.nix
View File

@ -2,20 +2,22 @@ rec {
inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {}) inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper utillinux utillinuxStatic sysvinit
e2fsprogsDiet e2fsprogs e2fsprogsDiet e2fsprogs
nettools nix 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; dhcpWrapper man nano eject sysklogd kudzu xawtv;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim utillinux utillinuxStatic sysvinit e2fsprogs nettools 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 mingettyWrapper grubWrapper parted module_init_tools gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
udev dhcpWrapper man nano;}; udev dhcpWrapper man nano;
nix = nixUnstable;};
init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux e2fsprogsDiet
nix shadowutils mingettyWrapper grubWrapper parted module_init_tools shadowutils mingettyWrapper grubWrapper parted module_init_tools
dhcpWrapper man nano eject;}; dhcpWrapper man nano eject;
nix = nixUnstable;};
everything = [boot sysvinit sysklogd kernel xawtv]; everything = [boot sysvinit sysklogd kernel xawtv];
} }