diff options
| -rw-r--r-- | nixos/modules/security/sudo.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/installer.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/security/sudo/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 4 insertions, 12 deletions
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 00b640dd2815..cbd1628caaec 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.sudoWithVisudo}/sbin/visudo -f $src -c && + "${pkgs.sudo}/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 13677be86e10..98e8142a0dfd 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -22,7 +22,6 @@ let isoImage.storeContents = [ pkgs.glibcLocales pkgs.sudo - pkgs.sudoWithVisudo pkgs.docbook5 pkgs.docbook5_xsl pkgs.grub diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6ed94da10ba0..b4c2d7f1c1fa 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, coreutils, pam, groff, keepVisudo ? false }: +{ stdenv, fetchurl, coreutils, pam, groff }: stdenv.mkDerivation rec { - name = "sudo-1.8.9p4"; + name = "sudo-1.8.10p3"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "19y75bsh4z2kid5jk2r84z7rvmnh90n8cb9fbn9l4rcw83lzjhqr"; + sha256 = "002l6h27pnhb77b65frhazbhknsxvrsnkpi43j7i0qw1lrgi7nkf"; }; postConfigure = '' @@ -32,11 +32,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - # ‘visudo’ does not make sense on NixOS - except for checking sudoers - # file syntax - rm ${if keepVisudo then "" else "$out/sbin/visudo"} \ - $out/share/man/man8/visudo.8 - rm $out/share/doc/sudo/ChangeLog ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4aa330a119c1..99874a72f91f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2082,8 +2082,6 @@ let sudo = callPackage ../tools/security/sudo { }; - sudoWithVisudo = sudo.override { keepVisudo = true; }; - suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { }; super = callPackage ../tools/security/super { }; |