futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: iwd: Update to 1.14.

Browse Source 
* gnu/packages/networking.scm (iwd): Update to 1.14.
[source]: Switch to URL-FETCH.
[native-inputs]: Remove ASCIIDOC, AUTOCONF, AUTOMAKE and LIBTOOL.  Add
PYTHON-DOCUTILS.
[arguments]: Remove obsolete configure flag.  Don't disable test, adjust
Makefile substitution to work with bootstrapped sources.
This commit is contained in:
Marius Bakke 2021-05-18 19:04:19 +02:00
parent def0b7fcac
commit 72c0b147ff
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/networking.scm
View File

@ -23,7 +23,7 @@
;;; Copyright © 2018 Tonton <tonton@riseup.net> ;;; Copyright © 2018 Tonton <tonton@riseup.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2018 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018, 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -3599,28 +3599,26 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
(define-public iwd (define-public iwd
(package (package
(name "iwd") (name "iwd")
(version "0.21") (version "1.14")
(source (origin (source (origin
(method git-fetch) ;; FIXME: We're using the bootstrapped sources because
(uri (git-reference ;; otherwise using an external ell library is impossible.
(url "https://git.kernel.org/pub/scm/network/wireless/iwd.git") ;; How to bootstrap with Guix?
(commit version))) (method url-fetch)
(file-name (git-file-name name version)) (uri (string-append "https://www.kernel.org/pub/linux/network"
"/wireless/iwd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"001dikinsa6kshwscjbvwipavzwpqnpvx9fpshcn63gbvbhyd393")))) "02vz4lyd6vq3vcii357ljqprnas78zb8j670a0gblrm6kganmgi1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("ell" ,ell) ("ell" ,ell)
("readline" ,readline))) ("readline" ,readline)))
(native-inputs (native-inputs
`(("asciidoc" ,asciidoc) `(("pkgconfig" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkgconfig" ,pkg-config)
("python" ,python) ("python" ,python)
("rst2man" ,python-docutils)
("openssl" ,openssl))) ("openssl" ,openssl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -3630,22 +3628,17 @@ protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. ")
"--enable-hwsim" "--enable-hwsim"
"--enable-tools" "--enable-tools"
"--enable-wired" "--enable-wired"
"--enable-docs"
"--localstatedir=/var" "--localstatedir=/var"
(string-append "--with-dbus-datadir=" dbus "/share/") (string-append "--with-dbus-datadir=" dbus "/share/")
(string-append "--with-dbus-busdir=" (string-append "--with-dbus-busdir="
dbus "/share/dbus-1/system-services"))) dbus "/share/dbus-1/system-services")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'bootstrap 'pre-bootstrap (add-after 'configure 'patch-Makefile
(lambda _ (lambda _
(substitute* "Makefile.am" (substitute* "Makefile"
;; Test disabled because it needs the kernel module
;; 'pkcs8_key_parser' loaded.
(("unit\\/test-eapol.*? ") "")
;; Don't try to 'mkdir /var'. ;; Don't try to 'mkdir /var'.
(("\\$\\(MKDIR_P\\) -m 700") "true")) (("\\$\\(MKDIR_P\\) -m 700") "true")))))))
#t)))))
(home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/") (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/")
(synopsis "Internet Wireless Daemon") (synopsis "Internet Wireless Daemon")
(description "iwd is a wireless daemon for Linux that aims to replace WPA (description "iwd is a wireless daemon for Linux that aims to replace WPA