From f8e108c86522cf31e06a4e31e240dc895605e4fb Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 17 Jun 2014 05:15:29 +0200
Subject: [PATCH] nixos.tests.installer: Fix test failures due to network being
 disabled

---
 nixos/modules/security/sudo.nix | 2 +-
 nixos/tests/installer.nix       | 1 +
 pkgs/top-level/all-packages.nix | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index e8ed545c8cc7..00b640dd2815 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -83,7 +83,7 @@ in
 	  {src = pkgs.writeText "sudoers-in" cfg.configFile; }
           # Make sure that the sudoers file is syntactically valid.
           # (currently disabled - NIXOS-66)
-          "${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c &&
+          "${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c &&
 	      cp $src $out";
         target = "sudoers";
         mode = "0440";
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 98e8142a0dfd..13677be86e10 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -22,6 +22,7 @@ let
             isoImage.storeContents =
               [ pkgs.glibcLocales
                 pkgs.sudo
+                pkgs.sudoWithVisudo
                 pkgs.docbook5
                 pkgs.docbook5_xsl
                 pkgs.grub
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025a4b1cf37f..32a7b383c9ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2080,6 +2080,8 @@ let
 
   sudo = callPackage ../tools/security/sudo { };
 
+  sudoWithVisudo = sudo.override { keepVisudo = true; };
+
   suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
 
   super = callPackage ../tools/security/super { };