From e1d8c5de61724f851773b3bd5fb29fc550ffaf0a Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Mon, 14 Apr 2025 22:12:06 +0100
Subject: [PATCH] accommodate newer dropbear in nixpkgs 25.05

---
 overlay.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 76a90ac..2eab059 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -141,20 +141,22 @@ extraPkgs
   dropbear = crossOnly prev.dropbear (
     d:
     d.overrideAttrs (o: rec {
+      # nixpkgs 25.05 contains newer dropbear (2025.87) than this,
+      # we can drop this override when that's ready
       version = "2024.85";
       src = final.fetchurl {
         url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
         sha256 = "sha256-hrA2xDOmnYnOUeuuM11lxHc4zPkNE+XrD+qDLlVtpQI=";
       };
       patches =
-        # need to update nixpkgs patch for new version of dropbear
+        # in 24.11 we need to update nixpkgs patch for new version of dropbear
         let
           passPath = final.runCommand "pass-path" { } ''
             sed < ${builtins.head o.patches} -e 's,svr-chansession.c,src/svr-chansession.c,g' > $out
           '';
         in
         [
-          passPath
+          (if (lib.versionOlder o.version "2024") then passPath else (builtins.head o.patches))
           ./pkgs/dropbear/add-authkeyfile-option.patch
         ];
       postPatch = ''