From fb7db3a12fc830c7cbf7b42980d79f6c00c3aea0 Mon Sep 17 00:00:00 2001 From: jdlugosz963 Date: Sun, 29 Oct 2023 21:57:09 +0100 Subject: Add openvpn-nm plugin and change ppp version for pptp-nm plugin. --- guix/jd/desktops/base.scm | 3 ++- guix/jd/packages/vpn.scm | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'guix/jd') diff --git a/guix/jd/desktops/base.scm b/guix/jd/desktops/base.scm index 13bc5af..01a9a89 100644 --- a/guix/jd/desktops/base.scm +++ b/guix/jd/desktops/base.scm @@ -133,7 +133,8 @@ (service network-manager-service-type (network-manager-configuration (vpn-plugins (list - network-manager-pptp)))) + network-manager-pptp + network-manager-openvpn)))) (simple-service 'dbus-packages dbus-root-service-type (list blueman virt-manager)) diff --git a/guix/jd/packages/vpn.scm b/guix/jd/packages/vpn.scm index 2542bae..ccfb8f7 100644 --- a/guix/jd/packages/vpn.scm +++ b/guix/jd/packages/vpn.scm @@ -20,9 +20,23 @@ #:use-module (guix build-system gnu) #:use-module (guix utils) #:use-module (guix packages) - #:use-module (guix download)) + #:use-module (guix download) + #:use-module (guix inferior) + #:use-module (guix channels)) +(define channels + (list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554")))) + +(define inferior + (inferior-for-channels channels)) + +(define ppp-2.4.9 (car (lookup-inferior-packages inferior "ppp"))) + (define-public pptp-client (package @@ -62,7 +76,7 @@ (inputs (list perl)) (native-inputs - (list ppp + (list ppp-2.4.9 iproute)) (home-page "https://sourceforge.net/projects/pptpclient/") (synopsis "PPTP-Client") @@ -133,7 +147,7 @@ other Unix systems.") network-manager libnma libsecret - ppp + ppp-2.4.9 pptp-client)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "PPTP plug-in for NetworkManager") -- cgit v1.2.3