From d52d5e584a86522db9a4415e1f41b61d2ac76ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Jan 2024 13:19:28 +0100 Subject: [PATCH 1/2] sudo: switch to finalAttrs pattern --- pkgs/tools/security/sudo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e7e31b204d47..9b1b1e44c633 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -12,12 +12,12 @@ , withSssd ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sudo"; version = "1.9.15p5"; src = fetchurl { - url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; + url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; hash = "sha256-VY0QuaGZH7O5+n+nsH7EQFt677WzywsIcdvIHjqI5Vg="; }; @@ -86,4 +86,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ delroth ]; platforms = platforms.linux; }; -} +}) From 5dcd36f8025165c7bdff0162241d31ccd543c08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Jan 2024 13:19:56 +0100 Subject: [PATCH 2/2] sudo: add meta.mainProgram --- pkgs/tools/security/sudo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 9b1b1e44c633..996baca2567f 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ sudo bsd2 bsd3 zlib ]; maintainers = with maintainers; [ delroth ]; platforms = platforms.linux; + mainProgram = "sudo"; }; })