bug#33078: Attempt to build my GuixSD system now fails

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1064 bytes --]

Mark H Weaver <mhw@netris.org> writes:

> When I try to build my x86_64 GuixSD system, based on my system
> configuration which I've not modified since May, it now fails:

[...]

> In gnu/services/networking.scm:
>    1076:9  0 (config->package _)
>
> gnu/services/networking.scm:1076:9: In procedure config->package:
> Throw to key `match-error' with args `("match" "no matching pattern" #<package wpa-supplicant@2.6 gnu/packages/admin.scm:1147 3246780>)'.

Whoops, sorry for this breakage!

> Here's my system configuration:

[...]

>   (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?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Type: text/x-patch, Size: 1919 bytes --]

1 file changed, 15 insertions(+), 12 deletions(-)
gnu/services/networking.scm | 27 +++++++++++++++------------

modified   gnu/services/networking.scm
@@ -1072,19 +1072,22 @@ networking."))))
             (stop #~(make-kill-destructor)))))))
 
 (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))))))
+      (service-type (name 'wpa-supplicant)
+                    (extensions
+                     (list (service-extension shepherd-root-service-type
+                                              wpa-supplicant-shepherd-service)
+                           (service-extension dbus-root-service-type package)
+                           (service-extension profile-service-type package)))
+                    (description "Run the WPA Supplicant daemon, a service that
 implements authentication, key negotiation and more for wireless networks.")
-                  (default-value (wpa-supplicant-configuration)))))
+                    (default-value (wpa-supplicant-configuration))))))
 
 \f
 ;;;

[back]

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]