From 54a23fd1095b58da8d1420dc9f64bc6e22d72cbd Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 26 Jan 2025 01:38:15 +0000 Subject: [PATCH] cross: push vpnc-related changes upstream to nixpkgs --- overlays/cross.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 1edbfe237..1f7803480 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -515,7 +515,7 @@ in with final; { # addNativeInputs [ gtk4.dev ] prev.networkmanager-sstp # ) # ); - # 2025/01/13: upstreaming is blocked on vpnc + # 2025/01/25: upstreaming is blocked on vpnc; both are out for review: # networkmanager-vpnc = mvToNativeInputs [ glib ] prev.networkmanager-vpnc; # 2024/11/19: upstreaming is unblocked @@ -920,8 +920,8 @@ in with final; { # }); # fixes "perl: command not found" - # 2025/01/13: upstreaming is unblocked, but requires alternative fix - # - i think the build script tries to run the generated binary? + # 2025/01/25: upstreaming is unblocked, out for review: + # - proper fix (as done in PR) is more involved # vpnc = mvToNativeInputs [ perl ] prev.vpnc; # 2024/08/12: upstreaming is unblocked