From 8951442c6e56270e1de41f3110c8311ba73ee447 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Aug 2023 18:12:57 +0100 Subject: [PATCH] sudo: backport fix for missing newlines Pull upstream fix for https://bugzilla.sudo.ws/show_bug.cgi?id=1057. Otherwise `sudo` breaks newlines for `stderr` as: $ { sudo printf "a\nb\nc\n" >&2; } |& nl 1 a 2 b 3 c --- pkgs/tools/security/sudo/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 6cf8349b09af..7c5546d4e45e 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { url = "https://github.com/sudo-project/sudo/commit/760c9c11074cb921ecc0da9fbb5f0a12afd46233.patch"; hash = "sha256-smwyoYEkaqfQYz9C4VVz59YMtKabOPpwhS+RBwXbWuE="; }) + # Fix for the patch above: + # https://bugzilla.sudo.ws/show_bug.cgi?id=1057 + (fetchpatch { + url = "https://github.com/sudo-project/sudo/commit/d148e7d8f9a98726dd4fde6f187c7d614e1258c7.patch"; + hash = "sha256-3I3PnuAHlBs3JOn0Ul900aFxuUkDGV4sM3S5DNtW7bE="; + }) ]; prePatch = ''