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

we can safely use the stable version again 

svn path=/nixu/trunk/; revision=6680
This commit is contained in:
Armijn Hemel 2006-10-08 22:05:06 +00:00
parent edcdb69c57
commit c8b64ef689
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fill-disk.sh
View File

@ -248,7 +248,7 @@ unset NIX_CONF_DIR
## Fix this. Probably nix-instantiate, then nix-store -r. ## Fix this. Probably nix-instantiate, then nix-store -r.
## Also make sure everything gets installed into an actual profile! ## Also make sure everything gets installed into an actual profile!
$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nixUnstable $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A nix
$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A coreutils
$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep $NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A gnugrep
#$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel #$NIX/nix-env -iKf $nixpkgs/pkgs/top-level/all-packages.nix -A kernel

2
make-disk.sh
View File

@ -35,7 +35,7 @@ initrd=/tmp/initram.img
initdir=${archivesDir}/initdir initdir=${archivesDir}/initdir
initscript=$archivesDir/scripts/init.sh initscript=$archivesDir/scripts/init.sh
nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -)) nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -)) busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -)) nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -)) nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))

5
pkgs.nix
View File

@ -2,7 +2,7 @@ rec {
inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {}) inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
@ -13,8 +13,7 @@ rec {
e2fsprogs nettools subversion gcc wget which vim less screen openssh e2fsprogs nettools subversion gcc wget which vim less screen openssh
strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
nano; nano nix;
nix = nixUnstable;
}; };
#init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet