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

fix installer tests

This commit is contained in:
Domen Kožar 2014-12-05 18:19:27 +01:00
parent 7ce1cbed93
commit 226d209d97
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/installer.nix
View File

@ -38,7 +38,7 @@ let
makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier
, readOnly ? true, forceGrubReinstallCount ? 0 }: , readOnly ? true, forceGrubReinstallCount ? 0 }:
pkgs.writeText "configuration.nix" '' pkgs.writeText "configuration.nix" ''
{ config, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ imports = { imports =
[ ./hardware-configuration.nix [ ./hardware-configuration.nix
@ -58,7 +58,7 @@ let
${optionalString (!readOnly) "nix.readOnlyStore = false;"} ${optionalString (!readOnly) "nix.readOnlyStore = false;"}
swapDevices = mkOverride 0 [ ]; swapDevices = lib.mkOverride 0 [ ];
environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
} }
@ -68,7 +68,7 @@ let
# Configuration of a web server that simulates the Nixpkgs channel # Configuration of a web server that simulates the Nixpkgs channel
# distribution server. # distribution server.
webserver = webserver =
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ services.httpd.enable = true; { services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";