amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Ludovic Courtès 2015-09-13 21:28:01 +02:00
commit 75710da667
131 changed files with 6648 additions and 1338 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/admin.scm
View file

@ -704,9 +704,9 @@ commands and their arguments.")
;; See <http://www.sudo.ws/sudo/license.html>.
(license license:x11)))
(define-public wpa-supplicant-light
(define-public wpa-supplicant-minimal
(package
(name "wpa-supplicant-light")
(name "wpa-supplicant-minimal")
(version "2.4")
(source (origin
(method url-fetch)
@ -796,12 +796,12 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.")
(license license:bsd-3)))
(define-public wpa-supplicant
(package (inherit wpa-supplicant-light)
(package (inherit wpa-supplicant-minimal)
(name "wpa-supplicant")
(inputs `(("dbus" ,dbus)
,@(package-inputs wpa-supplicant-light)))
,@(package-inputs wpa-supplicant-minimal)))
(arguments
(substitute-keyword-arguments (package-arguments wpa-supplicant-light)
(substitute-keyword-arguments (package-arguments wpa-supplicant-minimal)
((#:phases phases)
`(alist-cons-after
'configure 'configure-for-dbus