[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: services: network-manager: Properly load vpn plugins
From: |
guix-commits |
Subject: |
02/06: services: network-manager: Properly load vpn plugins |
Date: |
Wed, 17 Jul 2019 05:12:40 -0400 (EDT) |
jlicht pushed a commit to branch master
in repository guix.
commit 40557aeab594907bf56b0a2a367061dbdd19f4aa
Author: Jelle Licht <address@hidden>
Date: Wed Jul 3 14:03:25 2019 +0200
services: network-manager: Properly load vpn plugins
Extends the dbus service when vpn plugins are enabled.
* gnu/services/networking.scm (network-manager-service-type): Load vpn
plugins
when extending dbus service.
---
gnu/services/networking.scm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 13cffd9..7423bac 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2018 Chris Marusich <address@hidden>
;;; Copyright © 2018 Arun Isaac <address@hidden>
;;; Copyright © 2019 Florian Pelz <address@hidden>
+;;; Copyright © 2019 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -942,24 +943,27 @@ and @command{wicd-curses} user interfaces."
(define network-manager-service-type
(let
- ((config->package
+ ((config->packages
(match-lambda
- (($ <network-manager-configuration> network-manager)
- (list network-manager)))))
+ (($ <network-manager-configuration> network-manager _ vpn-plugins)
+ `(,network-manager ,@vpn-plugins)))))
(service-type
(name 'network-manager)
(extensions
(list (service-extension shepherd-root-service-type
network-manager-shepherd-service)
- (service-extension dbus-root-service-type config->package)
- (service-extension polkit-service-type config->package)
+ (service-extension dbus-root-service-type config->packages)
+ (service-extension polkit-service-type
+ (compose
+ list
+ network-manager-configuration-network-manager))
(service-extension activation-service-type
network-manager-activation)
(service-extension session-environment-service-type
network-manager-environment)
;; Add network-manager to the system profile.
- (service-extension profile-service-type config->package)))
+ (service-extension profile-service-type config->packages)))
(default-value (network-manager-configuration))
(description
"Run @uref{https://wiki.gnome.org/Projects/NetworkManager,
- branch master updated (e13714b -> d376129), guix-commits, 2019/07/17
- 01/06: gnu: network-manager: Fix plugin loading problem., guix-commits, 2019/07/17
- 03/06: services: network-manager: Clear default OpenVPN user., guix-commits, 2019/07/17
- 05/06: gnu: network-manager-openvpn: Patch hardcoded paths., guix-commits, 2019/07/17
- 04/06: gnu: network-manager-openvpn: Pass '--localstatedir=/var'., guix-commits, 2019/07/17
- 02/06: services: network-manager: Properly load vpn plugins,
guix-commits <=
- 06/06: gnu: Add network-manager-vpnc., guix-commits, 2019/07/17