From 5ed6df90c240a1cfee0b9af8c6f94b1333eb4f20 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 25 Jan 2025 12:42:24 +0000 Subject: [PATCH] cross: push networkmanager plugin patches toward upstream --- overlays/cross.nix | 8 ++++---- pkgs/by-name/nixpkgs-bootstrap/patches.nix | 17 ----------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/overlays/cross.nix b/overlays/cross.nix index 5fb67439b..deb06a18a 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -524,18 +524,18 @@ in with final; { # fixes "gdbus-codegen: command not found" # fixes "gtk4-builder-tool: command not found" - # 2025/01/13: upstreaming is unblocked + # 2025/01/24: upstreaming is unblocked, out for PR: # networkmanager-l2tp = addNativeInputs [ gtk4 ] # (mvToNativeInputs [ glib ] prev.networkmanager-l2tp); # fixes "properties/gresource.xml: Permission denied" # - by providing glib-compile-resources - # 2025/01/13: upstreaming is unblocked + # 2025/01/24: upstreaming is unblocked, out for PR: # networkmanager-openconnect = mvToNativeInputs [ glib ] prev.networkmanager-openconnect; # fixes "properties/gresource.xml: Permission denied" # - by providing glib-compile-resources - # 2025/01/13: upstreaming is unblocked,implemented + # 2025/01/24: upstreaming is unblocked, out for PR: # networkmanager-openvpn = mvToNativeInputs [ glib ] prev.networkmanager-openvpn; - # 2025/01/13: upstreaming is unblocked,implemented + # 2025/01/24: upstreaming is unblocked, out for PR: # networkmanager-sstp = ( # # fixes "gdbus-codegen: command not found" # mvToNativeInputs [ glib ] ( diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix index 52418e3ae..e04e5ffea 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix @@ -129,21 +129,4 @@ in # name = "librewolf-pmos-mobile: init"; # hash = "sha256-oQEM3EZfAOmfZzDu9faCqyOFZsdHYGn1mVBgkxt68Zg="; # }) - - # these probably work, but i don't use them - # (fetchpatch' { - # name = "networkmanager-openvpn: support cross compilation"; - # saneCommit = "6f53c267fbeb2ff543f075032a7e73af2d4bcb9e"; - # hash = "sha256-gq9AyKH7/k2ZVSZ3jpPJPt3uAM+CllXQnaiC1tE1r/8="; - # }) - # (fetchpatch' { - # name = "WIP: networkmanager-sstp: support cross compilation"; - # saneCommit = "6de63fe320406ec9a509db721c52b3894a93bda2"; - # hash = "sha256-EY3bQuv/80JbpquUJhc89CcYAgN9A9KkpsSitw/684I="; - # }) - # (fetchpatch' { - # name = "WIP: networkmanager-l2tp: support cross compilation"; - # saneCommit = "7a4191c570b0e5a1ab257222c26a4a2ecb945037"; - # hash = "sha256-FiPJhHGqZ8MFwLY+1t6HgbK6ndomFSYUKvApvrikRHE="; - # }) ]