me/guix
Archived
1
0
Fork 0
Code Activity

gnu: network-manager: Update to 1.14.4.

Browse source 
* gnu/packages/gnome.scm (network-manager): Update to 1.14.4.
[source]: Simplify snippet.
[arguments]: Pass more configure flags to use elogind; add phase
"patch-ls-invocation"; adjust tests.
[inputs]: Add coreutils.
This commit is contained in:
Ricardo Wurmus 2018-12-05 19:50:29 +01:00 • committed by Kei Kebreau
parent 2fbe8cdb43
commit 02710a9b55
No known key found for this signature in database
GPG key ID: E6A5EE3C19467A0D
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/gnome.scm
View file

@ -5290,7 +5290,7 @@ users.")
(define-public network-manager (define-public network-manager
(package (package
(name "network-manager") (name "network-manager")
(version "1.10.10") (version "1.14.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/" (uri (string-append "mirror://gnome/sources/NetworkManager/"
@ -5298,19 +5298,12 @@ users.")
"NetworkManager-" version ".tar.xz")) "NetworkManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4")) "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"))
(modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils))
(substitute* "configure"
;; Replace libsystemd-login with libelogind.
(("libsystemd-login") "libelogind"))
(substitute* "src/devices/wwan/nm-modem-manager.c" (substitute* "src/devices/wwan/nm-modem-manager.c"
(("systemd") "elogind")) (("systemd") "elogind"))
(substitute* "src/nm-session-monitor.c"
(("systemd") "elogind"))
(substitute* "./src/nm-logging.c"
(("systemd") "elogind"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
@ -5321,7 +5314,10 @@ users.")
(doc (assoc-ref %outputs "doc")) (doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient"))) "/sbin/dhclient")))
(list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind. (list "--with-libnm-glib" ; needed by network-manager-applet
"--with-systemd-journal=no"
"--with-session-tracking=elogind"
"--with-suspend-resume=elogind"
"--with-consolekit=no" "--with-consolekit=no"
"--with-crypto=gnutls" "--with-crypto=gnutls"
"--disable-config-plugin-ibft" "--disable-config-plugin-ibft"
@ -5336,6 +5332,13 @@ users.")
(string-append "--with-dhclient=" dhclient))) (string-append "--with-dhclient=" dhclient)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; This bare "ls" invocation breaks some tests.
(add-after 'unpack 'patch-ls-invocation
(lambda _
(substitute* "build-aux/ltmain.sh"
(("`ls -")
(string-append "`" (which "ls") " -")))
#t))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda _ (lambda _
;; These tests try to test aspects of network-manager's ;; These tests try to test aspects of network-manager's
@ -5348,26 +5351,24 @@ users.")
(("src/platform/tests/test-cleanup-linux") " ") (("src/platform/tests/test-cleanup-linux") " ")
(("src/platform/tests/test-link-linux") " ") (("src/platform/tests/test-link-linux") " ")
(("src/platform/tests/test-route-linux") " ") (("src/platform/tests/test-route-linux") " ")
(("src/devices/tests/test-acd") "")
(("src/devices/tests/test-arping") " ") (("src/devices/tests/test-arping") " ")
(("src/devices/tests/test-lldp") " ") (("src/devices/tests/test-lldp") " ")
(("src/tests/test-route-manager-linux") " ")) (("src/tests/test-route-manager-linux") " "))
#t)) #t))
(add-after 'unpack 'delete-failing-tests (add-after 'unpack 'delete-failing-tests
(lambda _ (lambda _
;; FIXME: These four tests fail for unknown reasons. ;; FIXME: These three tests fail for unknown reasons.
;; ERROR:libnm-core/tests/test-general.c:5842: ;; ERROR:libnm-core/tests/test-general.c:5842:
;; _json_config_check_valid: assertion failed (res == expected): (1 == 0) ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0)
;; ERROR:libnm-core/tests/test-keyfile.c:647: ;; ERROR:libnm-core/tests/test-keyfile.c:647:
;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL) ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL)
;; ERROR:libnm-core/tests/test-setting.c:907: ;; ERROR:libnm-core/tests/test-setting.c:907:
;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner)) ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner))
;; NetworkManager:ERROR:src/platform/tests/test-nmp-object.c:397:
;; test_cache_link: assertion failed: (nmp_object_is_visible (obj_new))
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("libnm-core/tests/test-general") " ") (("libnm-core/tests/test-general") " ")
(("libnm-core/tests/test-keyfile") " ") (("libnm-core/tests/test-keyfile") " ")
(("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " ") (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " "))
(("src/platform/tests/test-nmp-object") " "))
#t)) #t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
@ -5398,7 +5399,8 @@ users.")
("python-dbus" ,python-dbus) ("python-dbus" ,python-dbus)
("python-pygobject" ,python-pygobject))) ("python-pygobject" ,python-pygobject)))
(inputs (inputs
`(("curl" ,curl) `(("coreutils" ,coreutils) ; for ls
("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("dnsmasq" ,dnsmasq) ("dnsmasq" ,dnsmasq)