diff options
author | Florian Klink <flokli@flokli.de> | 2018-03-23 22:17:32 +0100 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2018-03-23 22:24:50 +0100 |
commit | 6ac74d60ad5c8f535ab535a13d8c365dddc6c401 (patch) | |
tree | e81b7777293cd472a1a81831a9507ac12fd336b8 /nixos/modules/services/networking/networkmanager.nix | |
parent | f0e597252660e9550606be319b14a21ac64fa930 (diff) | |
download | nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar.gz nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar.bz2 nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar.lz nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar.xz nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.tar.zst nixpkgs-6ac74d60ad5c8f535ab535a13d8c365dddc6c401.zip |
networkmanager-pptp: remove package
Currently broken on NixOS due to hardcoded modprobe binary path (see bug #30756 from Oct 2017), no activity on a proposed fix for months. As the protocol is terribly broken anyways, let's better remove it completely, and not talk about anymore ;-) Closes #30756.
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f83fb7a6d5d..10e96eb4036 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -135,8 +135,7 @@ in { default = { inherit networkmanager modemmanager wpa_supplicant networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-pptp networkmanager-l2tp - networkmanager-iodine; }; + networkmanager-l2tp networkmanager-iodine; }; internal = true; }; @@ -267,8 +266,6 @@ in { message = "You can not use networking.networkmanager with networking.wireless"; }]; - boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = with cfg.basePackages; [ { source = configFile; target = "NetworkManager/NetworkManager.conf"; @@ -285,9 +282,6 @@ in { { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; - target = "NetworkManager/VPN/nm-pptp-service.name"; - } { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } |