From 6f768bf47c754b8d4a484a443fbcaf33911faf93 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Jan 2014 11:01:31 -0600 Subject: [PATCH 1/2] networkmanager: register PPTP service --- nixos/modules/services/networking/networkmanager.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 62bf38e4e70..40c20aae4ef 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -146,6 +146,9 @@ in { { source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } + { source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; + target = "NetworkManager/VPN/nm-pptp-service.name"; + } ] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; @@ -155,6 +158,7 @@ in { networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect + networkmanager_pptp ]; users.extraGroups = singleton { @@ -199,6 +203,7 @@ in { networkmanager_openvpn networkmanager_vpnc networkmanager_openconnect + networkmanager_pptp ]; services.udev.packages = cfg.packages; From 28a593469f80ce8b5ee9f305fbc398cdb94849fa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 2 Jan 2014 11:01:54 -0600 Subject: [PATCH 2/2] networkmanager-pptp: fix checksum --- pkgs/tools/networking/network-manager/pptp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index dc2c800e797..72180d95d0c 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz"; - sha256 = "7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6daa"; + sha256 = "1s6wmznd6azvg028x8y3syniqy9j7nmx5j71w2wc6mk0f9pqzflp"; }; buildInputs = [ networkmanager pptp ppp ]