Hey Marius, Ping! :-)
Ludo’. l...@gnu.org (Ludovic Courtès) skribis: > Hello, > > Marius Bakke <mba...@fastmail.com> skribis: > >> Marius Bakke <mba...@fastmail.com> writes: >> >>> Mark H Weaver <m...@netris.org> writes: >>> >>>> (services (cons* (console-keymap-service keymap) >>>> ;;(xfce-desktop-service) >>>> (gnome-desktop-service) >>>> (service network-manager-service-type >>>> (network-manager-configuration)) >>>> (service wpa-supplicant-service-type wpa-supplicant) >>> >>> To adapt to the new interface, this should be changed to: >>> >>> (service wpa-supplicant-service-type) >>> >>> ...though it would be good to have backwards compatibility here. WDYT >>> of this approach? >> >> [...] >> >>> (define wpa-supplicant-service-type >>> - (let ((config->package >>> - (match-lambda >>> - (($ <wpa-supplicant-configuration> wpa-supplicant) >>> - (list wpa-supplicant))))) >>> - (service-type (name 'wpa-supplicant) >>> - (extensions >>> - (list (service-extension shepherd-root-service-type >>> - >>> wpa-supplicant-shepherd-service) >>> - (service-extension dbus-root-service-type >>> config->package) >>> - (service-extension profile-service-type >>> config->package))) >>> - (description "Run the WPA Supplicant daemon, a service >>> that >>> + (lambda* (#:optional wpa-supplicant-package) ;deprecated >>> + (let ((package >>> + (if wpa-supplicant-package >>> + wpa-supplicant-package >>> + (match-lambda >>> + (($ <wpa-supplicant-configuration> wpa-supplicant) >>> + (list wpa-supplicant)))))) >> >> Derp, this obviously won't work. >> >> I've tried various incarnations to match a package object in the >> match-lambda with little success. Suggestions? > > ‘wpa-supplicant-service-type’ must remain a <service-type> record, so > the above cannot work. > > Maybe this? > > diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm > index 61a0e975c..391c6ec59 100644 > --- a/gnu/services/networking.scm > +++ b/gnu/services/networking.scm > @@ -1077,7 +1077,9 @@ networking.")))) > (let ((config->package > (match-lambda > (($ <wpa-supplicant-configuration> wpa-supplicant) > - (list wpa-supplicant))))) > + (list wpa-supplicant)) > + ((? package? package) > + (list package))))) > (service-type (name 'wpa-supplicant) > (extensions > (list (service-extension shepherd-root-service-type > > > HTH, > Ludo’.
