diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/connman.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/connman.scm')
| -rw-r--r-- | gnu/packages/connman.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index e6d97db0fd..7268af4c8b 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -28,6 +28,7 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages compression) #:use-module (gnu packages enlightenment) #:use-module (gnu packages glib) #:use-module (gnu packages linux) @@ -44,14 +45,14 @@ (define-public connman (package (name "connman") - (version "1.39") + (version "1.40") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/network/connman/" "connman-" version ".tar.xz")) - (sha256 - (base32 "1wqs307vjphhh73qbqk25zxhhqwn1mdk6bpzl5qcd4blkcbafqlz")))) + (sha256 + (base32 "04nbxpaxykncp65fyh4lk778vn9145fbxhxa8hbkmailw9yawmqs")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -75,6 +76,7 @@ ("gnutls" ,gnutls) ("iptables" ,iptables) ("libmnl" ,libmnl) + ("lz4" ,lz4) ; required by openconnect.pc ("readline" ,readline) ;; These inputs are needed for connman to include the interface to ;; these technologies so IF they are installed they can be used. @@ -148,7 +150,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (sha256 (base32 "0jn12wxwjznady6aniwmvahg1dj25p902sdwj0070biv6vx5c7dq")))) (inputs - `(("qtbase" ,qtbase))) + `(("qtbase" ,qtbase-5))) (native-inputs `(("qttools" ,qttools))) (build-system gnu-build-system) |