From e31d882bb9bde2e9ef54e0a73d54dadb0edd92fc Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 7 May 2025 20:26:26 +0200
Subject: [PATCH 1/4] sudo-rs: 0.2.5 -> 0.2.6

https://github.com/trifectatechfoundation/sudo-rs/releases/tag/v0.2.6
---
 pkgs/by-name/su/sudo-rs/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index b5c24a9a156b..8a4337d6ed91 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -8,20 +8,21 @@
   pam,
   pandoc,
   rustPlatform,
+  tzdata,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "sudo-rs";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
     rev = "v${version}";
-    hash = "sha256-apvMcn/1dV9uujyoHikiOxregwWtAFPvrZvYjd3XQwM=";
+    hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw=";
   };
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EAfNg7hUsynFZ+EcUqeD9o44BakBYIMgxRXc4vcl8HY=";
+  cargoHash = "sha256-/CbU2ds2VQ2IXx7GKxRO3vePzLXJXabA1FcyIGPsngw=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -33,8 +34,11 @@ rustPlatform.buildRustPackage rec {
   # Don't attempt to generate the docs in a (pan)Docker container
   postPatch = ''
     substituteInPlace util/generate-docs.sh \
-      --replace "/usr/bin/env bash" ${lib.getExe bash} \
-      --replace util/pandoc.sh pandoc
+      --replace-fail "/usr/bin/env bash" ${lib.getExe bash} \
+      --replace-fail util/pandoc.sh pandoc
+
+    substituteInPlace build.rs \
+      --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
   '';
 
   postInstall = ''

From 07931771e8014bbf88a110fdb3b90a2191493bbb Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 7 May 2025 20:27:13 +0200
Subject: [PATCH 2/4] sudo-rs: add myself as maintainer

---
 pkgs/by-name/su/sudo-rs/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 8a4337d6ed91..cf5dd060d5c0 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -87,7 +87,10 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ nicoo ];
+    maintainers = with maintainers; [
+      nicoo
+      rvdp
+    ];
     mainProgram = "sudo";
     platforms = platforms.linux;
   };

From 7fc7a643268c412422952f862183aabb89b54837 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 7 May 2025 20:39:54 +0200
Subject: [PATCH 3/4] sudo-rs: use finalAttrs

---
 pkgs/by-name/su/sudo-rs/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index cf5dd060d5c0..5c7a2cdfa4f5 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -11,14 +11,14 @@
   tzdata,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sudo-rs";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw=";
   };
   useFetchCargoVendor = true;
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Memory safe implementation of sudo and su";
     homepage = "https://github.com/trifectatechfoundation/sudo-rs";
-    changelog = "${meta.homepage}/blob/v${version}/CHANGELOG.md";
+    changelog = "${finalAttrs.meta.homepage}/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with licenses; [
       asl20
       mit
@@ -94,4 +94,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "sudo";
     platforms = platforms.linux;
   };
-}
+})

From 7bc3861c8810391cdd7eb81a08e17d32b1b6b969 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 7 May 2025 23:45:57 +0200
Subject: [PATCH 4/4] sudo-rs: cleanup

---
 pkgs/by-name/su/sudo-rs/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix
index 5c7a2cdfa4f5..ed9ec2611308 100644
--- a/pkgs/by-name/su/sudo-rs/package.nix
+++ b/pkgs/by-name/su/sudo-rs/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "trifectatechfoundation";
     repo = "sudo-rs";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-vZv3IVSW6N0puoWJBYQPmNntgHPt9SPV07TEuWN/bHw=";
   };
   useFetchCargoVendor = true;
@@ -79,19 +79,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tests = nixosTests.sudo-rs;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Memory safe implementation of sudo and su";
     homepage = "https://github.com/trifectatechfoundation/sudo-rs";
     changelog = "${finalAttrs.meta.homepage}/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       nicoo
       rvdp
     ];
     mainProgram = "sudo";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })