mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
- add udev (not yet in use)
- clean up 100 MB of unused stuff on the CD svn path=/nixu/trunk/; revision=3637
This commit is contained in:
parent
9a29f70977
commit
b39fca2ade
@ -1,7 +1,7 @@
|
||||
{ stdenv, kernel, bash, coreutils, findutils, 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, modutils, hotplug}:
|
||||
, gnutar, gzip, mingetty, grubWrapper, parted, modutils, hotplug, udev}:
|
||||
|
||||
derivation {
|
||||
name = "boot";
|
||||
@ -14,5 +14,5 @@ derivation {
|
||||
inherit stdenv kernel bash coreutils findutils 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 modutils;
|
||||
gnutar gnugrep gzip mingetty grubWrapper parted modutils udev;
|
||||
}
|
||||
|
@ -63,8 +63,7 @@ e2fsprogs=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' |
|
||||
modutils=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).modutils' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
grub=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
hotplug=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).hotplug' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
#gnused=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
#gnugrep=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
udev=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).udev' | $NIX_CMD_PATH/nix-instantiate -))
|
||||
|
||||
(while read storepath; do
|
||||
cp -fa --parents ${storepath} ${archivesDir}
|
||||
@ -115,6 +114,7 @@ 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}
|
||||
|
||||
bashdeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).bash' | $NIX_CMD_PATH/nix-instantiate -)))
|
||||
|
||||
@ -173,6 +173,9 @@ touch ${initdir}/NIXOS
|
||||
|
||||
(cd ${initdir}; find . |cpio -c -o) | gzip -9 > ${initrd}
|
||||
|
||||
chmod -f -R +w ${initdir}/*
|
||||
rm -rf ${initdir}
|
||||
|
||||
cp ${initrd} ${archivesDir}/isolinux
|
||||
|
||||
echo creating ISO image
|
||||
|
4
pkgs.nix
4
pkgs.nix
@ -3,12 +3,12 @@ rec {
|
||||
stdenv kernel bash coreutils findutils 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 modutils hotplug;
|
||||
mingetty grubWrapper syslinux parted modutils hotplug udev;
|
||||
|
||||
boot = (import ./boot) {inherit stdenv kernel bash coreutils findutils
|
||||
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 modutils hotplug;};
|
||||
gnused gnutar gnugrep gzip mingetty grubWrapper parted modutils hotplug udev;};
|
||||
|
||||
init = (import ./init) {inherit stdenv bash coreutils
|
||||
utillinux e2fsprogs nix shadowutils mingetty grubWrapper parted modutils hotplug;};
|
||||
|
Loading…
Reference in New Issue
Block a user