dan/liminix
1
0
Fork 5
Code

accommodate newer dropbear in nixpkgs 25.05

Browse Source
This commit is contained in:
Daniel Barlow 2025-04-14 22:12:06 +01:00
parent 6a89b5b4d4
commit e1d8c5de61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
overlay.nix
View File

@ -141,20 +141,22 @@ extraPkgs
dropbear = crossOnly prev.dropbear ( dropbear = crossOnly prev.dropbear (
d: d:
d.overrideAttrs (o: rec { 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"; version = "2024.85";
src = final.fetchurl { src = final.fetchurl {
url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2"; url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
sha256 = "sha256-hrA2xDOmnYnOUeuuM11lxHc4zPkNE+XrD+qDLlVtpQI="; sha256 = "sha256-hrA2xDOmnYnOUeuuM11lxHc4zPkNE+XrD+qDLlVtpQI=";
}; };
patches = 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 let
passPath = final.runCommand "pass-path" { } '' passPath = final.runCommand "pass-path" { } ''
sed < ${builtins.head o.patches} -e 's,svr-chansession.c,src/svr-chansession.c,g' > $out sed < ${builtins.head o.patches} -e 's,svr-chansession.c,src/svr-chansession.c,g' > $out
''; '';
in in
[ [
passPath (if (lib.versionOlder o.version "2024") then passPath else (builtins.head o.patches))
./pkgs/dropbear/add-authkeyfile-option.patch ./pkgs/dropbear/add-authkeyfile-option.patch
]; ];
postPatch = '' postPatch = ''