summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-23 00:41:37 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-04-23 00:41:37 +0000
commit6c1bb54483b3110d611a46ba0617c84100a2e3a0 (patch)
tree40925f36c02afdec197ad7c8c5514e01dec41488 /tests
parent72990dae376fe5fc4fe8083239c1f713b2dd08a8 (diff)
downloadnixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.gz
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.bz2
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.lz
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.xz
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.tar.zst
nixpkgs-6c1bb54483b3110d611a46ba0617c84100a2e3a0.zip
* In the installation CD, make the NixOS/Nixpkgs available as if they
  were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
Diffstat (limited to 'tests')
-rw-r--r--tests/installer.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/installer.nix b/tests/installer.nix
index 73cf6312f59..b64a24c1e3f 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -131,7 +131,7 @@ let
 
         # Test nix-env.
         $machine->mustFail("hello");
-        $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i hello");
+        $machine->mustSucceed("nix-env -i hello");
         $machine->mustSucceed("hello") =~ /Hello, world/
             or die "bad `hello' output";
       ''}
@@ -175,7 +175,7 @@ let
       # !!! Idem.
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
 
-      $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i coreutils >&2");
+      $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";