cosmetic change

svn path=/nixu/trunk/; revision=6036
This commit is contained in:
Armijn Hemel 2006-08-03 18:00:32 +00:00
parent e030a74c87
commit 97690c23da

View File

@ -1,24 +1,27 @@
rec { 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
e2fsprogsDiet e2fsprogs utillinux utillinuxStatic sysvinit e2fsprogsDiet e2fsprogs nettools
nettools nixUnstable subversion gcc wget which vim less screen openssh binutils nixStatic nixUnstable subversion gcc wget which vim less screen openssh binutils
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
dhcpWrapper man nano eject sysklogd mktemp cdrtools cpio; module_init_toolsStatic udev dhcpWrapper man nano eject sysklogd mktemp
cdrtools cpio;
boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper boot = (import ./boot) {
utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux
less screen openssh binutils strace shadowutils iputils gnumake curl utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which
gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools vim less screen openssh binutils strace shadowutils iputils gnumake curl
udev dhcpWrapper man nano; gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted
nix = nixUnstable;}; module_init_tools udev dhcpWrapper man nano;
nix = nixUnstable;
};
init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet utillinux init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
shadowutils mingettyWrapper grubWrapper parted module_init_tools utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
dhcpWrapper man nano eject e2fsprogsDiet; dhcpWrapper man nano eject e2fsprogsDiet;
nix = nixUnstable; nix = nixUnstable;
}; };
everything = [boot sysvinit sysklogd kernel ]; everything = [boot sysvinit sysklogd kernel ];
} }