From 5a306a774696046dfa0a4fe2ba14826f2be4cd6a Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 31 Mar 2026 22:13:06 +0200 Subject: [PATCH] nixos/globalprotect-vpn: drop --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 7 +++ .../services/networking/globalprotect-vpn.nix | 62 ------------------- 3 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 nixos/modules/services/networking/globalprotect-vpn.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 746c8b05a964..71252674c417 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1212,7 +1212,6 @@ ./services/networking/geph.nix ./services/networking/ghostunnel.nix ./services/networking/git-daemon.nix - ./services/networking/globalprotect-vpn.nix ./services/networking/gns3-server.nix ./services/networking/gnunet.nix ./services/networking/go-autoconfig.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index bd9f0dea099d..352cdf9b7f7f 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -214,6 +214,13 @@ in ] "The fourStoreEndpoint module has been removed") (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") + (mkRemovedOptionModule + [ + "services" + "globalprotect" + ] + "The corresponding package was removed from nixpkgs, as it depended on qt5 webengine. A replacements based on tauri exist upstream, but requires non-trivial maintainance in nixpkgs to update." + ) (mkRemovedOptionModule [ "services" diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix deleted file mode 100644 index 626a9cd0130d..000000000000 --- a/nixos/modules/services/networking/globalprotect-vpn.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.globalprotect; - - execStart = - if cfg.csdWrapper == null then - "${pkgs.globalprotect-openconnect}/bin/gpservice" - else - "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}"; -in - -{ - options.services.globalprotect = { - enable = lib.mkEnableOption "globalprotect"; - - settings = lib.mkOption { - description = '' - GlobalProtect-openconnect configuration. For more information, visit - . - ''; - default = { }; - example = { - "vpn1.company.com" = { - openconnect-args = "--script=/path/to/vpnc-script"; - }; - }; - type = lib.types.attrs; - }; - - csdWrapper = lib.mkOption { - description = '' - A script that will produce a Host Integrity Protection (HIP) report, - as described at - ''; - default = null; - example = lib.literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"''; - type = lib.types.nullOr lib.types.path; - }; - }; - - config = lib.mkIf cfg.enable { - services.dbus.packages = [ pkgs.globalprotect-openconnect ]; - - environment.etc."gpservice/gp.conf".text = lib.generators.toINI { } cfg.settings; - - systemd.services.gpservice = { - description = "GlobalProtect openconnect DBus service"; - serviceConfig = { - Type = "dbus"; - BusName = "com.yuezk.qt.GPService"; - ExecStart = execStart; - }; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - }; - }; -}