From 226d209d97ad06ad0ff9e6e63f717decc9a9bb2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 5 Dec 2014 18:19:27 +0100 Subject: [PATCH] fix installer tests --- nixos/tests/installer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f27854f7645..e09572de489 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -38,7 +38,7 @@ let makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier , readOnly ? true, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' - { config, pkgs, modulesPath, ... }: + { config, lib, pkgs, modulesPath, ... }: { imports = [ ./hardware-configuration.nix @@ -58,7 +58,7 @@ let ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - swapDevices = mkOverride 0 [ ]; + swapDevices = lib.mkOverride 0 [ ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; } @@ -68,7 +68,7 @@ let # Configuration of a web server that simulates the Nixpkgs channel # distribution server. webserver = - { config, pkgs, ... }: + { config, lib, pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org";