mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
add nano
svn path=/nixu/trunk/; revision=3670
This commit is contained in:
Armijn Hemel
parent
bc79eeb3b0
commit
d707a61ac2
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
20
make-disk.sh
20
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 -)))
|
||||
|
||||
|
||||
12
pkgs.nix
12
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];
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user