Author: eelco Date: Fri Apr 20 09:44:27 2012 New Revision: 33852 URL: https://nixos.org/websvn/nix/?rev=33852&sc=1
Log: * Fix the installer test (http://hydra.nixos.org/build/2430122). Modified: nixos/trunk/tests/installer.nix Modified: nixos/trunk/tests/installer.nix ============================================================================== --- nixos/trunk/tests/installer.nix Fri Apr 20 04:31:17 2012 (r33851) +++ nixos/trunk/tests/installer.nix Fri Apr 20 09:44:27 2012 (r33852) @@ -77,7 +77,7 @@ { services.httpd.enable = true; services.httpd.adminAddr = "[email protected]"; services.httpd.servedDirs = singleton - { urlPath = "/releases/nixpkgs/channels/nixpkgs-unstable"; + { urlPath = "/releases/nixos/channels/nixos-unstable"; dir = "/tmp/channel"; }; @@ -109,7 +109,7 @@ $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 @@ # 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"; ''} _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
