diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 20:08:28 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:58 +0100 |
| commit | 30a36f9a80b998f7f4bca8e5246c2dfa1946771c (patch) | |
| tree | 8146ab198a4b40fdac872a404704d30af8f93649 /nixos/tests | |
| parent | 621f4c42f56c264a3b568b14cdd8cff03067a1c1 (diff) | |
| download | nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar.gz nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar.bz2 nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar.lz nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar.xz nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.tar.zst nixpkgs-30a36f9a80b998f7f4bca8e5246c2dfa1946771c.zip | |
Remove remaining uses of mkOverrideTemplate
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/check-filesystems.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix index 39e8883ee59..c1dae0ca621 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 bebd6c04374..865b21d2444 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. |