commit f8e108c86522cf31e06a4e31e240dc895605e4fb · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

nixos.tests.installer: Fix test failures due to network being disabled

Ricardo M. Correia 11 years ago f8e108c8 50287f2c

+4 -1

3 changed files

expand all

unified split

nixos

modules

security

sudo.nix

tests

installer.nix

pkgs

top-level

all-packages.nix

+1 -1

nixos/modules/security/sudo.nix

··· 83 83 {src = pkgs.writeText "sudoers-in" cfg.configFile; } 84 84 # Make sure that the sudoers file is syntactically valid. 85 85 # (currently disabled - NIXOS-66) 86 - "${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c && 86 + "${pkgs.sudoWithVisudo}/sbin/visudo -f $src -c && 87 87 cp $src $out"; 88 88 target = "sudoers"; 89 89 mode = "0440";

nixos/tests/installer.nix

··· 22 22 isoImage.storeContents = 23 23 [ pkgs.glibcLocales 24 24 pkgs.sudo 25 + pkgs.sudoWithVisudo 25 26 pkgs.docbook5 26 27 pkgs.docbook5_xsl 27 28 pkgs.grub

pkgs/top-level/all-packages.nix

··· 2080 2080 2081 2081 sudo = callPackage ../tools/security/sudo { }; 2082 2082 2083 + sudoWithVisudo = sudo.override { keepVisudo = true; }; 2084 + 2083 2085 suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; 2084 2086 2085 2087 super = callPackage ../tools/security/super { };