diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-20 09:44:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-04-20 09:44:27 +0000 |
| commit | d8a6cddbd0f627e891c0bab9c30c24968f544b55 (patch) | |
| tree | 47af9086ab9d79babc03505da0dcfeb54ad38327 | |
| parent | fa50d105d7a16961f000846e3fa4e80021519639 (diff) | |
| download | nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar.gz nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar.bz2 nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar.lz nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar.xz nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.tar.zst nixpkgs-d8a6cddbd0f627e891c0bab9c30c24968f544b55.zip | |
* Fix the installer test (http://hydra.nixos.org/build/2430122).
svn path=/nixos/trunk/; revision=33852
| -rw-r--r-- | tests/installer.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/installer.nix b/tests/installer.nix index e70a412e35a..73cf6312f59 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -77,7 +77,7 @@ let { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; services.httpd.servedDirs = singleton - { urlPath = "/releases/nixpkgs/channels/nixpkgs-unstable"; + { urlPath = "/releases/nixos/channels/nixos-unstable"; dir = "/tmp/channel"; }; @@ -109,7 +109,7 @@ let $webserver->mustSucceed("mkdir /tmp/channel"); $webserver->mustSucceed( "nix-push file:///tmp/channel " . - "http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " . + "http://nixos.org/releases/nixos/channels/nixos-unstable " . "file:///tmp/channel/MANIFEST ${toString channelContents} >&2"); ''} @@ -131,7 +131,7 @@ let # Test nix-env. $machine->mustFail("hello"); - $machine->mustSucceed("nix-env -i hello"); + $machine->mustSucceed("nix-env -f /etc/nixos/nixpkgs -i hello"); $machine->mustSucceed("hello") =~ /Hello, world/ or die "bad `hello' output"; ''} |