summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-10-29 12:42:35 -0500
committerWill Dietz <w@wdtz.org>2019-10-29 16:13:17 -0500
commit640677c30d977dfaaebea4b4c303b39ea0a8cd52 (patch)
tree54e6be0cc7bd14f9a397932c0530464eb4641a11
parent4d680f3f3d583ec67fef13d176fca1c31f294ea7 (diff)
downloadnixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar.gz
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar.bz2
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar.lz
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar.xz
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.tar.zst
nixpkgs-640677c30d977dfaaebea4b4c303b39ea0a8cd52.zip
sudo: 1.8.28 -> 1.8.29
https://www.sudo.ws/stable.html#1.8.29

Build tweak: fix build failure when attempting to check that
the "existing" sudoers file on $out/etc/sudoers parses clean--
this update changed precondition for this test to check if
DESTDIR is non-empty instead of previous behavior
"does the file exist".
-rw-r--r--pkgs/tools/security/sudo/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index c3e464da516..a0922f4df73 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.28";
+  name = "sudo-1.8.29";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "188k3w67aflbmi4b5z23pxrvzfcfndi22b84w86gzjh8b9sglaci";
+    sha256 = "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf";
   };
 
   prePatch = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       #define _PATH_MV "${coreutils}/bin/mv"
     EOF
     makeFlags="install_uid=$(id -u) install_gid=$(id -g)"
-    installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy"
+    installFlags="sudoers_uid=$(id -u) sudoers_gid=$(id -g) sysconfdir=$out/etc rundir=$TMPDIR/dummy vardir=$TMPDIR/dummy DESTDIR=/"
     '';
 
   nativeBuildInputs = [ groff ];