From 30a36f9a80b998f7f4bca8e5246c2dfa1946771c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 28 Oct 2013 20:08:28 +0100 Subject: Remove remaining uses of mkOverrideTemplate --- nixos/tests/check-filesystems.nix | 2 +- nixos/tests/installer.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/tests') diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix index 39e8883ee598..c1dae0ca621a 100644 --- a/nixos/tests/check-filesystems.nix +++ b/nixos/tests/check-filesystems.nix @@ -40,7 +40,7 @@ rec { device = "share:/repos2"; fsType = "nfs"; }; - in pkgs.lib.mkOverrideTemplate 50 {} [ + in pkgs.lib.mkOverride 50 [ repos1 repos1 # check remount repos2 # check after remount diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index bebd6c04374b..865b21d2444a 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -14,7 +14,7 @@ let [ ../modules/installer/cd-dvd/installation-cd-graphical.nix ../modules/testing/test-instrumentation.nix { key = "serial"; - boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0; + boot.loader.grub.timeout = mkOverride 0 0; # The test cannot access the network, so any sources we # need must be included in the ISO. -- cgit 1.4.1