;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages samba)
(define-public connman
(package
(name "connman")
- (version "1.34")
+ (version "1.38")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/linux/network/connman/"
- name "-" version ".tar.xz"))
+ "connman-" version ".tar.xz"))
(sha256
- (base32
- "07n71wcy1c4cc01ca4dl9k1jpdqr5nsyr33dqf7k87wwfa681859"))))
+ (base32 "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-nmcompat"
- "--enable-polkit"
+ "--enable-polkit" ; Polkit doesn't need to be present at build time.
"--enable-openconnect"
"--enable-openvpn"
"--enable-vpnc"
- "--enable-pptp"
"--enable-l2tp"
- ;; location for daemon state files and internal configuration
- ;; needs to be writeable
"--localstatedir=/var"
(string-append
"--with-dbusconfdir=" (assoc-ref %outputs "out") "/etc")
(string-append
"--with-dbusdatadir=" (assoc-ref %outputs "out") "/share"))))
(native-inputs
- `(("pkg-config", pkg-config)
- ("python" ,python-2)))
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
(inputs
`(("dbus" ,dbus)
("glib" ,glib)
("gnutls" ,gnutls)
("iptables" ,iptables)
- ("polkit" ,polkit) ;so connman can be used by unprivileged users
+ ("libmnl" ,libmnl)
("readline" ,readline)
;; These inputs are needed for connman to include the interface to
;; these technologies so IF they are installed they can be used.
;; TODO: add neard, ofono
("openconnect" ,openconnect)
("openvpn" ,openvpn)
- ("ppp", ppp)
+ ("ppp" ,ppp)
("vpnc" ,vpnc)
- ("wpa-supplicant" ,wpa-supplicant)))
+ ("wpa-supplicant" ,wpa-supplicant)
+ ("xl2tpd" ,xl2tpd)))
(home-page "https://01.org/connman")
(synopsis "Connection management daemon")
(description "Connman provides a daemon for managing Internet connections.
`(#:configure-flags '("--localstatedir=/var")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'set-home-directory
+ ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2
+ (lambda _ (setenv "HOME" "/tmp") #t))
(add-after 'install 'wrap-binary
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("efl" ,efl)
- ("python-2" ,python-2)
- ("python2-dbus" ,python2-dbus)
- ("python2-efl" ,python2-efl)))
+ ("python" ,python-wrapper)
+ ("python-dbus" ,python-dbus)
+ ("python-efl" ,python-efl)))
(home-page "https://www.enlightenment.org")
(synopsis "Connman User Interface written using the EFL")
(description
(define-public cmst
(package
(name "cmst")
- (version "2017.03.18")
+ (version "2019.01.13")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/andrew-bibb/cmst/releases/download/cmst-"
- version "/cmst-" version ".tar.gz"))
+ version "/cmst-" version ".tar.xz"))
(sha256
- (base32 "16g9byxr1rkmrnzi6sjplpmkr8h6pqj7418jz30czqviw5qlkqwl"))))
+ (base32 "1cn6xz2rpkf5kx5d6p2x2lh85zppjacp59l6gj3n6x12p90al1vl"))))
(inputs
- `(("qt" ,qt)))
+ `(("qtbase" ,qtbase)))
(native-inputs
- `(("qmake" ,qt)))
+ `(("qttools" ,qttools)))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
- (zero?
- (system* "qmake"
- (string-append "PREFIX="
- (assoc-ref outputs "out"))))))
- (add-before 'install 'fix-Makefiles
+ (invoke "qmake"
+ (string-append "PREFIX="
+ (assoc-ref outputs "out")))))
+ (add-before 'build 'fix-Makefiles
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* (find-files "." "Makefile")
(("INSTALL_ROOT)")
(string-append "INSTALL_ROOT)" out))
- (("/usr/bin") "/bin"))))))))
+ (("/usr") ""))
+ (substitute* '("apps/cmstapp/cmstapp.pro"
+ "apps/cmstapp/code/control_box/controlbox.cpp"
+ "apps/rootapp/rootapp.pro"
+ "apps/rootapp/system/org.cmst.roothelper.service"
+ "cmst.pri"
+ "cmst.pro")
+ (("/usr") out)
+ (("/etc") (string-append out "/etc")))
+ #t))))))
(home-page "https://github.com/andrew-bibb/cmst")
(synopsis "Qt frontend for Connman")
(description