diff options
Diffstat (limited to 'guix')
-rw-r--r-- | guix/jd/desktops/base.scm | 3 | ||||
-rw-r--r-- | guix/jd/packages/vpn.scm | 20 |
2 files changed, 19 insertions, 4 deletions
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 @@ | |||
133 | (service network-manager-service-type | 133 | (service network-manager-service-type |
134 | (network-manager-configuration | 134 | (network-manager-configuration |
135 | (vpn-plugins (list | 135 | (vpn-plugins (list |
136 | network-manager-pptp)))) | 136 | network-manager-pptp |
137 | network-manager-openvpn)))) | ||
137 | 138 | ||
138 | (simple-service 'dbus-packages dbus-root-service-type (list blueman | 139 | (simple-service 'dbus-packages dbus-root-service-type (list blueman |
139 | virt-manager)) | 140 | 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 @@ | |||
20 | #:use-module (guix build-system gnu) | 20 | #:use-module (guix build-system gnu) |
21 | #:use-module (guix utils) | 21 | #:use-module (guix utils) |
22 | #:use-module (guix packages) | 22 | #:use-module (guix packages) |
23 | #:use-module (guix download)) | 23 | #:use-module (guix download) |
24 | #:use-module (guix inferior) | ||
25 | #:use-module (guix channels)) | ||
24 | 26 | ||
25 | 27 | ||
28 | (define channels | ||
29 | (list (channel | ||
30 | (name 'guix) | ||
31 | (url "https://git.savannah.gnu.org/git/guix.git") | ||
32 | (commit | ||
33 | "9b77bd0b9b4f3de69390da0ba7db5b9dbc01e554")))) | ||
34 | |||
35 | (define inferior | ||
36 | (inferior-for-channels channels)) | ||
37 | |||
38 | (define ppp-2.4.9 (car (lookup-inferior-packages inferior "ppp"))) | ||
39 | |||
26 | 40 | ||
27 | (define-public pptp-client | 41 | (define-public pptp-client |
28 | (package | 42 | (package |
@@ -62,7 +76,7 @@ | |||
62 | (inputs | 76 | (inputs |
63 | (list perl)) | 77 | (list perl)) |
64 | (native-inputs | 78 | (native-inputs |
65 | (list ppp | 79 | (list ppp-2.4.9 |
66 | iproute)) | 80 | iproute)) |
67 | (home-page "https://sourceforge.net/projects/pptpclient/") | 81 | (home-page "https://sourceforge.net/projects/pptpclient/") |
68 | (synopsis "PPTP-Client") | 82 | (synopsis "PPTP-Client") |
@@ -133,7 +147,7 @@ other Unix systems.") | |||
133 | network-manager | 147 | network-manager |
134 | libnma | 148 | libnma |
135 | libsecret | 149 | libsecret |
136 | ppp | 150 | ppp-2.4.9 |
137 | pptp-client)) | 151 | pptp-client)) |
138 | (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") | 152 | (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") |
139 | (synopsis "PPTP plug-in for NetworkManager") | 153 | (synopsis "PPTP plug-in for NetworkManager") |