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

* Use the same Nix consistently.

Browse Source 
svn path=/nixu/trunk/; revision=7067
This commit is contained in:
Eelco Dolstra 2006-11-17 16:38:24 +00:00
parent e1e386cba6
commit 4798d7a4d2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/boot-environment.nix
View File

@ -25,6 +25,8 @@ rec {
allPackages = import ./pkgs/top-level/all-packages.nix; allPackages = import ./pkgs/top-level/all-packages.nix;
}; };
nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature
# Determine the set of modules that we need to mount the root FS. # Determine the set of modules that we need to mount the root FS.
modulesClosure = import ./modules-closure.nix { modulesClosure = import ./modules-closure.nix {
@ -70,7 +72,8 @@ rec {
# The installer. # The installer.
nixosInstaller = import ./installer.nix { nixosInstaller = import ./installer.nix {
inherit (pkgs) stdenv genericSubstituter; inherit (pkgs) stdenv genericSubstituter;
nix = pkgs.nixUnstable; # needs the exportReferencesGraph feature inherit nix;
nix = pkgs.nixUnstable;
shell = pkgs.bash + "/bin/sh"; shell = pkgs.bash + "/bin/sh";
}; };
@ -100,7 +103,6 @@ rec {
pkgs.less pkgs.less
pkgs.nano pkgs.nano
pkgs.netcat pkgs.netcat
pkgs.nix
pkgs.perl pkgs.perl
pkgs.procps pkgs.procps
pkgs.rsync pkgs.rsync
@ -109,6 +111,7 @@ rec {
pkgs.sysklogd pkgs.sysklogd
pkgs.sysvinit pkgs.sysvinit
# pkgs.vim # pkgs.vim
nix
nixosInstaller nixosInstaller
]; ];