Package: guix-patches;
Reported by: Brice Waegeneire <brice <at> waegenei.re>
Date: Mon, 11 May 2020 18:51:01 UTC
Severity: normal
Tags: patch
Done: Brice Waegeneire <brice <at> waegenei.re>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41193 in the body.
You can then email your comments to 41193 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 18:51:02 GMT) Full text and rfc822 format available.Brice Waegeneire <brice <at> waegenei.re>:guix-patches <at> gnu.org.
(Mon, 11 May 2020 18:51:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 00/13] Update network-manager suite Date: Mon, 11 May 2020 20:50:22 +0200
This patchset update the network-manager packages first to support
all trafic trough wireguard and second to fix most of the issue
and workaround found in their definition.
It's dependent on https://issues.guix.info/issue/41192 which add
the openresolv package.
Brice Waegeneire (13):
gnu: network-manager: Update to 1.24.0.
gnu: network-manager: Add iwd support.
gnu: network-manager: Switch to meson-build-system.
gnu: network-manager: Appease guix lint.
gnu: modem-manager: Update to 1.12.10.
gnu: libnma: Update to 1.8.28.
gnu: libnma: Update inputs and licenses.
gnu: libnma: Adjust indentation.
gnu: network-manager-openvpn: Update to 1.8.12.
gnu: network-manager-openconnect: Use libnma.
gnu: network-manager-vpnc: Use libnma.
gnu: network-manager-applet: Update to 1.16.0.
gnu: network-manager-applet: Appease guix lint.
gnu/local.mk | 2 +-
gnu/packages/freedesktop.scm | 10 +-
gnu/packages/gnome.scm | 254 ++++++++++--------
...atch => network-manager-plugin-path.patch} | 0
4 files changed, 139 insertions(+), 127 deletions(-)
rename gnu/packages/patches/{nm-plugin-path.patch => network-manager-plugin-path.patch} (100%)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:01 GMT) Full text and rfc822 format available.Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 01/13] gnu: network-manager: Update to 1.24.0. Date: Mon, 11 May 2020 21:00:34 +0200
* gnu/packages/gnome.scm (network-manager): Update to 1.24.0.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d5a2032ccf..04bd6e31d5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -50,6 +50,7 @@
;;; Copyright © 2020 raingloom <raingloom <at> riseup.net>
;;; Copyright © 2020 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
+;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6334,7 +6335,7 @@ users.")
(define-public network-manager
(package
(name "network-manager")
- (version "1.18.4")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -6343,7 +6344,7 @@ users.")
(patches (search-patches "nm-plugin-path.patch"))
(sha256
(base32
- "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3"))
+ "06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:02 GMT) Full text and rfc822 format available.Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 06/13] gnu: libnma: Update to 1.8.28. Date: Mon, 11 May 2020 21:00:39 +0200
* gnu/packages/gnome.scm (libnma): Update to 1.8.28.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eb95558e95..fd2a1506f4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -807,7 +807,7 @@ client devices can handle.")
(define-public libnma
(package
(name "libnma")
- (version "1.8.26")
+ (version "1.8.28")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -815,7 +815,7 @@ client devices can handle.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1w9lld38risnk1krknfwln24kabdxnj274pyz4jhndphwigrshaf"))))
+ "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t))
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:02 GMT) Full text and rfc822 format available.Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 03/13] gnu: network-manager: Switch to meson-build-system. Date: Mon, 11 May 2020 21:00:36 +0200
---
gnu/packages/gnome.scm | 134 ++++++++++++++++++++++-------------------
1 file changed, 71 insertions(+), 63 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 39909559cf..0a6cd0f36e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6351,42 +6351,42 @@ users.")
(substitute* "src/devices/wwan/nm-modem-manager.c"
(("systemd") "elogind"))
#t))))
- (build-system gnu-build-system)
+ (build-system meson-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(let ((out (assoc-ref %outputs "out"))
- (doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient")))
- (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-crypto=gnutls"
- "--with-iwd=yes"
- "--with-libaudit=yes"
- "--with-resolvconf=yes"
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- (string-append "--with-udev-dir="
- out "/lib/udev")
- (string-append "--with-dbus-sys-dir="
- out "/etc/dbus-1/system.d")
- (string-append "--with-html-dir="
- doc "/share/gtk-doc/html")
- (string-append "--with-dhclient=" dhclient)))
+ (list
+ ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path
+ ;; component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ out "/lib:"
+ out "/lib/NetworkManager/" ,version)
+ "-Dsystemd_journal=false"
+ "-Dsession_tracking=elogind"
+ "-Dsuspend_resume=elogind"
+ "-Dsystemdsystemunitdir=no"
+ "-Dsession_tracking_consolekit=false"
+ "-Ddhcpcd=no"
+ "-Ddhcpcanon=no"
+ "-Dcrypto=gnutls"
+ "-Diwd=true"
+ "-Dlibaudit=yes"
+ "-Dqt=false"
+ "-Ddocs=true"
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ (string-append "-Dudev_dir="
+ out "/lib/udev")
+ (string-append "-Ddbus_conf_dir="
+ out "/etc/dbus-1/system.d")
+
+ (string-append "-Ddhclient=" dhclient)))
#: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
(lambda _
;; These tests try to test aspects of network-manager's
@@ -6394,61 +6394,64 @@ users.")
;; cope with being already in the Guix build jail as that jail
;; lacks some features that they would like to proxy over (like
;; a /sys mount).
- (substitute* '("Makefile.in")
- (("src/platform/tests/test-address-linux") " ")
- (("src/platform/tests/test-cleanup-linux") " ")
- (("src/platform/tests/test-link-linux") " ")
- (("src/platform/tests/test-route-linux") " ")
- (("src/devices/tests/test-acd") "")
- (("src/devices/tests/test-arping") " ")
- (("src/devices/tests/test-lldp") " ")
- (("src/tests/test-route-manager-linux") " "))
- #t))
- (add-after 'unpack 'delete-failing-tests
- (lambda _
- ;; FIXME: These three tests fail for unknown reasons.
- ;; ERROR:libnm-core/tests/test-general.c:5842:
- ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0)
- ;; ERROR:libnm-core/tests/test-keyfile.c:647:
- ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL)
- ;; ERROR:libnm-core/tests/test-setting.c:907:
- ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner))
- (substitute* "Makefile.in"
- (("libnm-core/tests/test-general") " ")
- (("libnm-core/tests/test-keyfile") " ")
- (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " "))
+ (substitute* "src/platform/tests/meson.build"
+ ((".*test-address-linux.*") "")
+ ((".*test-cleanup-linux.*") "")
+ ((".*test-link-linux.*") "")
+ ((".*test-route-linux.*") ""))
+ (substitute* "src/devices/tests/meson.build"
+ ((".*test-acd.*") "")
+ ((".*test-lldp.*") ""))
#t))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* (find-files "." ".*\\.(xsl|xml)")
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t)))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
- (replace 'install
+ (add-before 'install 'no-polkit-magic
+ ;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
(lambda _
- (invoke "make"
- "sysconfdir=/tmp"
- "rundir=/tmp"
- "statedir=/tmp"
- "nmstatedir=/tmp/nm"
- "install")
- #t)))))
+ (setenv "PKEXEC_UID" "something")
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (for-each (lambda (directory)
+ (copy-recursively (string-append out directory)
+ (string-append doc directory))
+ (delete-file-recursively
+ (string-append out directory)))
+ '("/share/doc" "/share/gtk-doc"))
+ #t))))))
(propagated-inputs
`(("glib" ,glib)))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+ `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+ ("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
+ ("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool)
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
+ ("vala" ,vala)
;; For testing.
("python" ,python-wrapper)
("python-dbus" ,python-dbus)
("python-pygobject" ,python-pygobject)))
(inputs
- `(("coreutils" ,coreutils) ; for ls
- ("curl" ,curl)
+ `(("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl)
("dbus-glib" ,dbus-glib)
("dnsmasq" ,dnsmasq)
@@ -6464,6 +6467,7 @@ users.")
("libndp" ,libndp)
("libnl" ,libnl)
("libsoup" ,libsoup)
+ ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
("modem-manager" ,modem-manager)
("newt" ,newt) ;for the 'nmtui' console interface
("openresolv" ,openresolv) ; alternative resolv.conf manager
@@ -6480,7 +6484,11 @@ devices and connections, attempting to keep active network connectivity when
available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
devices, and provides VPN integration with a variety of different VPN
services.")
- (license license:gpl2+)
+ ;; “This NetworkManager project consists of the daemon, client tools, and
+ ;; libnm. libnm is licensed LGPL-2.1+, while the rest is licensed under
+ ;; GPL-2.0+.”
+ (license (list license:gpl2+
+ license:lgpl2.1+))
(properties '((upstream-name . "NetworkManager")))))
(define-public network-manager-openvpn
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:03 GMT) Full text and rfc822 format available.Message #17 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 07/13] gnu: libnma: Update inputs and licenses. Date: Mon, 11 May 2020 21:00:40 +0200
* gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and
add phase 'patch-docbook-xml'.
[native-inputs]: Add 'docboock-xml-4.3' and 'vala'.
[inputs]: Remove 'adwaita'icon-theme'.
[license]: Add 'lgpl2.1+'.
---
gnu/packages/gnome.scm | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fd2a1506f4..251c4d89cd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -818,16 +818,26 @@ client devices can handle.")
"09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "libnma-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gcr" ,gcr)
+ `(("gcr" ,gcr)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
@@ -837,10 +847,10 @@ client devices can handle.")
initially part of network-manager-applet and has now become a separate
project.")
(home-page "https://gitlab.gnome.org/GNOME/libnma")
-
;; Some files carry the "GPL-2.0+" SPDX identifier while others say
;; "LGPL-2.1+".
- (license license:gpl2+)))
+ (license (list license:gpl2+
+ license:lgpl2.1+))))
(define-public gnome-menus
(package
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:03 GMT) Full text and rfc822 format available.Message #20 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 11/13] gnu: network-manager-vpnc: Use libnma. Date: Mon, 11 May 2020 21:00:44 +0200
* gnu/packages/gnome.scm (network-manager-vpnc)[arguments]: Add
configure flag '--with-libnm-glib=no'.
[inputs]: Replace 'network-manager' by 'libnma'.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9fbf12f406..121b4e8027 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6568,7 +6568,8 @@ to virtual private networks (VPNs) via OpenVPN.")
"1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
+ `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"
+ "--with-libnm-glib=no")
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-path
@@ -6592,7 +6593,7 @@ to virtual private networks (VPNs) via OpenVPN.")
("kmod" ,kmod)
("vpnc" ,vpnc)
("network-manager" ,network-manager)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("libsecret" ,libsecret)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "VPNC plug-in for NetworkManager")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:04 GMT) Full text and rfc822 format available.Message #23 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 10/13] gnu: network-manager-openconnect: Use libnma. Date: Mon, 11 May 2020 21:00:43 +0200
* gnu/packages/gnome.scm (network-manager-openconnect)[native-inputs]:
Replace 'network-manager-applet' by 'libnma'.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ffe06ce81c..9fbf12f406 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6634,7 +6634,7 @@ Compatible with Cisco VPN concentrators configured to use IPsec.")
#t)))))
(native-inputs
`(("intltool" ,intltool)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("pkg-config" ,pkg-config)))
(inputs
`(("gcr" ,gcr)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:04 GMT) Full text and rfc822 format available.Message #26 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 05/13] gnu: modem-manager: Update to 1.12.10. Date: Mon, 11 May 2020 21:00:38 +0200
* gnu/packages/freedesktop.scm (modem-manager): Update to 1.12.10.
[arguments]: Remove arguments '--disable-more-warnings'.
---
gnu/packages/freedesktop.scm | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6d657815f4..2a27612b5c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1115,7 +1115,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.10.8")
+ (version "1.12.10")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1123,15 +1123,11 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "16hnl0sdriqgv4v30mfs64mdl9rw7lsh802zlm3ggwxxil3p9qfb"))))
+ "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
- `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")
- ;; FIXME: Without this flag the build fails with "error: assignment
- ;; from incompatible pointer type" whenever the return value of
- ;; "g_object_ref" is assigned to "ctx->self".
- "--disable-more-warnings")))
+ `(,(string-append "--with-udev-base-dir=" %output "/lib/udev"))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:04 GMT) Full text and rfc822 format available.Message #29 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 12/13] gnu: network-manager-applet: Update to 1.16.0. Date: Mon, 11 May 2020 21:00:45 +0200
* gnu/packages/gnome.scm (netowrk-manager-applet): Update to 1.16.0.
[arguments]: Remove 'configure-flags'.
[inputs]: Add 'libnma', remove 'iso-codes' and
'mobile-broadband-provider-info'.
---
gnu/packages/gnome.scm | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 121b4e8027..75f1f92334 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6684,7 +6684,7 @@ Cisco's AnyConnect SSL VPN.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
- (version "1.8.24")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/network-manager-applet/"
@@ -6692,13 +6692,10 @@ Cisco's AnyConnect SSL VPN.")
"network-manager-applet-" version ".tar.xz"))
(sha256
(base32
- "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi"))))
+ "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"))))
(build-system meson-build-system)
(arguments
- '(#:configure-flags
- ;; ‘Nobody should be using this’ but network-manager-openvpn 1.8.10 does.
- (list "-Dlibnm_gtk=true")
- #:glib-or-gtk? #t))
+ '(#:glib-or-gtk? #t))
(native-inputs
`(("intltool" ,intltool)
("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
@@ -6712,14 +6709,13 @@ Cisco's AnyConnect SSL VPN.")
("network-manager" ,network-manager)))
(inputs
`(("gcr" ,gcr)
- ("iso-codes" ,iso-codes)
+ ("libnma" ,libnma)
("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libselinux" ,libselinux)
("jansson" ,jansson) ; for team support
- ("modem-manager" ,modem-manager)
- ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)))
+ ("modem-manager" ,modem-manager)))
(synopsis "Applet for managing network connections")
(home-page "https://www.gnome.org/projects/NetworkManager/")
(description
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:05 GMT) Full text and rfc822 format available.Message #32 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 13/13] gnu: network-manager-applet: Appease guix lint. Date: Mon, 11 May 2020 21:00:46 +0200
* gnu/packages/gnome.scm (network-manager-applet)[home-page]: Replace
with permanent redirect URL.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 75f1f92334..46dc6d2823 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6717,7 +6717,7 @@ Cisco's AnyConnect SSL VPN.")
("jansson" ,jansson) ; for team support
("modem-manager" ,modem-manager)))
(synopsis "Applet for managing network connections")
- (home-page "https://www.gnome.org/projects/NetworkManager/")
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager")
(description
"This package contains a systray applet for NetworkManager. It displays
the available networks and allows users to easily switch between them.")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:05 GMT) Full text and rfc822 format available.Message #35 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 09/13] gnu: network-manager-openvpn: Update to 1.8.12. Date: Mon, 11 May 2020 21:00:42 +0200
* gnu/packages/gnome.scm (network-manager-openvpn): Update to 1.8.12.
[inputs]: Replace 'network-manager-applet' with 'libnma'.
---
gnu/packages/gnome.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ca18b5cedb..ffe06ce81c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6504,8 +6504,7 @@ services.")
(define-public network-manager-openvpn
(package
(name "network-manager-openvpn")
- ;; Updating? Check whether network-manager-applet still needs libnm_gtk.
- (version "1.8.10")
+ (version "1.8.12")
(source (origin
(method url-fetch)
(uri (string-append
@@ -6514,7 +6513,7 @@ services.")
"/NetworkManager-openvpn-" version ".tar.xz"))
(sha256
(base32
- "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g"))))
+ "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
@@ -6544,7 +6543,7 @@ services.")
("kmod" ,kmod)
("openvpn" ,openvpn)
("network-manager" ,network-manager)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("libsecret" ,libsecret)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:06 GMT) Full text and rfc822 format available.Message #38 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 08/13] gnu: libnma: Adjust indentation. Date: Mon, 11 May 2020 21:00:41 +0200
* gnu/packages/gnome.scm (libnma): Adjust indentation.
---
gnu/packages/gnome.scm | 84 +++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 251c4d89cd..ca18b5cedb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -806,50 +806,50 @@ client devices can handle.")
(define-public libnma
(package
- (name "libnma")
- (version "1.8.28")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
- (build-system meson-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* "libnma-docs.xml"
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd")))
- #t))))))
- (native-inputs
- `(("docbook-xml" ,docbook-xml-4.3)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gtk-doc" ,gtk-doc)
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("vala" ,vala)))
- (inputs
- `(("gcr" ,gcr)
- ("gtk+" ,gtk+)
- ("iso-codes" ,iso-codes)
- ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
- ("network-manager" ,network-manager)))
- (synopsis "Network Manager's applet library")
- (description "Libnma is an applet library for Network Manager. It was
+ (name "libnma")
+ (version "1.8.28")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "libnma-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t))))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
+ (inputs
+ `(("gcr" ,gcr)
+ ("gtk+" ,gtk+)
+ ("iso-codes" ,iso-codes)
+ ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
+ ("network-manager" ,network-manager)))
+ (synopsis "Network Manager's applet library")
+ (description "Libnma is an applet library for Network Manager. It was
initially part of network-manager-applet and has now become a separate
project.")
- (home-page "https://gitlab.gnome.org/GNOME/libnma")
- ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
- ;; "LGPL-2.1+".
- (license (list license:gpl2+
+ (home-page "https://gitlab.gnome.org/GNOME/libnma")
+ ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
+ ;; "LGPL-2.1+".
+ (license (list license:gpl2+
license:lgpl2.1+))))
(define-public gnome-menus
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:06 GMT) Full text and rfc822 format available.Message #41 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 04/13] gnu: network-manager: Appease guix lint. Date: Mon, 11 May 2020 21:00:37 +0200
* gnu/packages/gnome.scm (network-manager)[home-page]: Use the permenant
redirect URL.
* gnu/packages/patches/nm-plugin-path.patch: Renamed to
'gnu/packages/patches/network-manager-plugin-path.patch'.
---
gnu/local.mk | 2 +-
gnu/packages/gnome.scm | 4 ++--
...nm-plugin-path.patch => network-manager-plugin-path.patch} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename gnu/packages/patches/{nm-plugin-path.patch => network-manager-plugin-path.patch} (100%)
diff --git a/gnu/local.mk b/gnu/local.mk
index 48169fcdb6..fd8142460b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1295,7 +1295,7 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
- %D%/packages/patches/nm-plugin-path.patch \
+ %D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0a6cd0f36e..eb95558e95 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6341,7 +6341,7 @@ users.")
(uri (string-append "mirror://gnome/sources/NetworkManager/"
(version-major+minor version) "/"
"NetworkManager-" version ".tar.xz"))
- (patches (search-patches "nm-plugin-path.patch"))
+ (patches (search-patches "network-manager-plugin-path.patch"))
(sha256
(base32
"06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3"))
@@ -6477,7 +6477,7 @@ users.")
("util-linux" ,util-linux)
("elogind" ,elogind)))
(synopsis "Network connection manager")
- (home-page "https://www.gnome.org/projects/NetworkManager/")
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager")
(description
"NetworkManager is a system network service that manages your network
devices and connections, attempting to keep active network connectivity when
diff --git a/gnu/packages/patches/nm-plugin-path.patch b/gnu/packages/patches/network-manager-plugin-path.patch
similarity index 100%
rename from gnu/packages/patches/nm-plugin-path.patch
rename to gnu/packages/patches/network-manager-plugin-path.patch
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 19:02:06 GMT) Full text and rfc822 format available.Message #44 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH 02/13] gnu: network-manager: Add iwd support. Date: Mon, 11 May 2020 21:00:35 +0200
---
gnu/packages/gnome.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 04bd6e31d5..39909559cf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6366,7 +6366,9 @@ users.")
"--with-suspend-resume=elogind"
"--with-consolekit=no"
"--with-crypto=gnutls"
- "--disable-config-plugin-ibft"
+ "--with-iwd=yes"
+ "--with-libaudit=yes"
+ "--with-resolvconf=yes"
"--sysconfdir=/etc"
"--localstatedir=/var"
(string-append "--with-udev-dir="
@@ -6420,10 +6422,6 @@ users.")
(lambda _
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
-
- ;; XXX: Regenerate some of the tests that are dependent on Python version.
- ;; Try removing this variable for newer versions of NetworkManager.
- (setenv "NM_TEST_REGENERATE" "1")
#t))
(replace 'install
(lambda _
@@ -6458,7 +6456,9 @@ users.")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
+ ("iwd" ,iwd) ; wpa_supplicant alternative
("jansson" ,jansson)
+ ("libaudit" ,audit)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
@@ -6466,6 +6466,7 @@ users.")
("libsoup" ,libsoup)
("modem-manager" ,modem-manager)
("newt" ,newt) ;for the 'nmtui' console interface
+ ("openresolv" ,openresolv) ; alternative resolv.conf manager
("polkit" ,polkit)
("ppp" ,ppp)
("readline" ,readline)
--
2.26.2
Brice Waegeneire <brice <at> waegenei.re>
to control <at> debbugs.gnu.org.
(Mon, 11 May 2020 19:16:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 20:01:01 GMT) Full text and rfc822 format available.Message #49 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 07/13] gnu: libnma: Update inputs and licenses. Date: Mon, 11 May 2020 16:00:12 -0400
On Mon, May 11, 2020 at 09:00:40PM +0200, Brice Waegeneire wrote: > ;; Some files carry the "GPL-2.0+" SPDX identifier while others say > ;; "LGPL-2.1+". > - (license license:gpl2+))) > + (license (list license:gpl2+ > + license:lgpl2.1+)))) Watch the indentation here. However, in general, it's enough to list the license that the entire package is distributed under. Without taking a closer look, I'd guess it's GPL2+.
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 20:02:02 GMT) Full text and rfc822 format available.Message #52 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 11/13] gnu: network-manager-vpnc: Use libnma. Date: Mon, 11 May 2020 16:01:10 -0400
On Mon, May 11, 2020 at 09:00:44PM +0200, Brice Waegeneire wrote:
> + `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"
> + "--with-libnm-glib=no")
Can you add a brief code comment explaining this configure flag?
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Mon, 11 May 2020 20:06:01 GMT) Full text and rfc822 format available.Message #55 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 00/13] Update network-manager suite Date: Mon, 11 May 2020 16:05:01 -0400
On Mon, May 11, 2020 at 08:50:22PM +0200, Brice Waegeneire wrote: > This patchset update the network-manager packages first to support > all trafic trough wireguard and second to fix most of the issue > and workaround found in their definition. Thanks a lot for these patches! Can you say if they are tested and what you tried? I think there are some Guix system tests that should exercise NetworkManager. Can you check if they still pass?
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Tue, 12 May 2020 21:13:01 GMT) Full text and rfc822 format available.Message #58 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: Leo Famulari <leo <at> famulari.name> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 00/13] Update network-manager suite Date: Tue, 12 May 2020 21:12:33 +0000
On 2020-05-11 20:05, Leo Famulari wrote: > On Mon, May 11, 2020 at 08:50:22PM +0200, Brice Waegeneire wrote: >> This patchset update the network-manager packages first to support >> all trafic trough wireguard and second to fix most of the issue >> and workaround found in their definition. > > Thanks a lot for these patches! > > Can you say if they are tested and what you tried? I'm using network-manager patched now on my system ATM, I don't use the applet nor the plugins tho. So any testing is welcome. > I think there are some Guix system tests that should exercise > NetworkManager. Can you check if they still pass? I can't find the test in question, can you give me a hint were they should be? Cheers, - Brice
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Tue, 12 May 2020 21:19:02 GMT) Full text and rfc822 format available.Message #61 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: Leo Famulari <leo <at> famulari.name> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 07/13] gnu: libnma: Update inputs and licenses. Date: Tue, 12 May 2020 21:18:50 +0000
On 2020-05-11 20:00, Leo Famulari wrote: > On Mon, May 11, 2020 at 09:00:40PM +0200, Brice Waegeneire wrote: >> ;; Some files carry the "GPL-2.0+" SPDX identifier while others >> say >> ;; "LGPL-2.1+". >> - (license license:gpl2+))) >> + (license (list license:gpl2+ >> + license:lgpl2.1+)))) > > Watch the indentation here. However, in general, it's enough to list > the > license that the entire package is distributed under. Without taking a > closer look, I'd guess it's GPL2+. You're right it's mostly GPL2+, dropped that part.
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Tue, 12 May 2020 21:37:01 GMT) Full text and rfc822 format available.Message #64 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 00/13] Update network-manager suite Date: Tue, 12 May 2020 17:36:13 -0400
On Tue, May 12, 2020 at 09:12:33PM +0000, Brice Waegeneire wrote: > On 2020-05-11 20:05, Leo Famulari wrote: > > I think there are some Guix system tests that should exercise > > NetworkManager. Can you check if they still pass? > > I can't find the test in question, can you give me a hint were they > should be? The system tests are found in 'gnu/tests'. I know that %desktop-services (from 'gnu/services/desktop.scm') uses NetworkManager, so I grepped in 'gnu/tests' for %desktop-services, and found that some of the system installation tests use %desktop-services. Specifically, I think that the system test 'gui-installed-desktop-os-encrypted' should exercise NetworkManager: `make check-system TESTS=gui-installed-desktop-os-encrypted` It's not a hard requirement to run these tests IMO, especially since you are already using these patches successfully, but it's at least helpful to say if you tried or not.
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 16:37:02 GMT) Full text and rfc822 format available.Message #67 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: Leo Famulari <leo <at> famulari.name> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 00/13] Update network-manager suite Date: Fri, 22 May 2020 16:35:52 +0000
Hello Leo, On 2020-05-12 21:36, Leo Famulari wrote: > On Tue, May 12, 2020 at 09:12:33PM +0000, Brice Waegeneire wrote: >> On 2020-05-11 20:05, Leo Famulari wrote: >> > I think there are some Guix system tests that should exercise >> > NetworkManager. Can you check if they still pass? >> >> I can't find the test in question, can you give me a hint were they >> should be? > > The system tests are found in 'gnu/tests'. > > I know that %desktop-services (from 'gnu/services/desktop.scm') uses > NetworkManager, so I grepped in 'gnu/tests' for %desktop-services, and > found that some of the system installation tests use %desktop-services. > > Specifically, I think that the system test > 'gui-installed-desktop-os-encrypted' should exercise NetworkManager: > > `make check-system TESTS=gui-installed-desktop-os-encrypted` > > It's not a hard requirement to run these tests IMO, especially since > you > are already using these patches successfully, but it's at least helpful > to say if you tried or not. I tired running the test but even on master it fails, CI can't built it either. But trying to built it with my patches I manage to find 2 gnome packages that broke because of it: they were looking for libnma in network-manager-applet which isn't included with it anymore. There aren't any other packages directly depending on network-manager-applet so there shouldn't be any other breakage relating to this specific issue. sirmacik tested the patchset too and used the vpnc plugin fine but as me he is not a user of the applet. Should we wait for the test to be fixed, before going forward with this patchset? I'm sending the v2 shortly. Cheers, - Brice
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:13:01 GMT) Full text and rfc822 format available.Message #70 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 02/15] gnu: network-manager: Add iwd support. Date: Fri, 22 May 2020 19:12:33 +0200
---
gnu/packages/gnome.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 146beb976c..77dd669e97 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6381,7 +6381,9 @@ users.")
"--with-suspend-resume=elogind"
"--with-consolekit=no"
"--with-crypto=gnutls"
- "--disable-config-plugin-ibft"
+ "--with-iwd=yes"
+ "--with-libaudit=yes"
+ "--with-resolvconf=yes"
"--sysconfdir=/etc"
"--localstatedir=/var"
(string-append "--with-udev-dir="
@@ -6435,10 +6437,6 @@ users.")
(lambda _
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
-
- ;; XXX: Regenerate some of the tests that are dependent on Python version.
- ;; Try removing this variable for newer versions of NetworkManager.
- (setenv "NM_TEST_REGENERATE" "1")
#t))
(replace 'install
(lambda _
@@ -6473,7 +6471,9 @@ users.")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
+ ("iwd" ,iwd) ; wpa_supplicant alternative
("jansson" ,jansson)
+ ("libaudit" ,audit)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
@@ -6481,6 +6481,7 @@ users.")
("libsoup" ,libsoup)
("modem-manager" ,modem-manager)
("newt" ,newt) ;for the 'nmtui' console interface
+ ("openresolv" ,openresolv) ; alternative resolv.conf manager
("polkit" ,polkit)
("ppp" ,ppp)
("readline" ,readline)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:02 GMT) Full text and rfc822 format available.Message #73 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 01/15] gnu: network-manager: Update to 1.24.0. Date: Fri, 22 May 2020 19:12:32 +0200
* gnu/packages/gnome.scm (network-manager): Update to 1.24.0.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 092f9fcb00..146beb976c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -51,6 +51,7 @@
;;; Copyright © 2020 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
;;; Copyright © 2020 Naga Malleswari <nagamalli <at> riseup.net>
;;; Copyright © 2020 Ryan Prior <rprior <at> protonmail.com>
+;;; Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -6349,7 +6350,7 @@ users.")
(define-public network-manager
(package
(name "network-manager")
- (version "1.18.4")
+ (version "1.24.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -6358,7 +6359,7 @@ users.")
(patches (search-patches "nm-plugin-path.patch"))
(sha256
(base32
- "0pnh1wr2p1fqa5pr945fr3lngfc5ccfrmgddqsg55lxnjpv0ggd3"))
+ "06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:02 GMT) Full text and rfc822 format available.Message #76 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 03/15] gnu: network-manager: Switch to meson-build-system. Date: Fri, 22 May 2020 19:12:34 +0200
---
gnu/packages/gnome.scm | 134 ++++++++++++++++++++++-------------------
1 file changed, 71 insertions(+), 63 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 77dd669e97..33d4b38b14 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6366,42 +6366,42 @@ users.")
(substitute* "src/devices/wwan/nm-modem-manager.c"
(("systemd") "elogind"))
#t))))
- (build-system gnu-build-system)
+ (build-system meson-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(let ((out (assoc-ref %outputs "out"))
- (doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient")))
- (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-crypto=gnutls"
- "--with-iwd=yes"
- "--with-libaudit=yes"
- "--with-resolvconf=yes"
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- (string-append "--with-udev-dir="
- out "/lib/udev")
- (string-append "--with-dbus-sys-dir="
- out "/etc/dbus-1/system.d")
- (string-append "--with-html-dir="
- doc "/share/gtk-doc/html")
- (string-append "--with-dhclient=" dhclient)))
+ (list
+ ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path
+ ;; component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ out "/lib:"
+ out "/lib/NetworkManager/" ,version)
+ "-Dsystemd_journal=false"
+ "-Dsession_tracking=elogind"
+ "-Dsuspend_resume=elogind"
+ "-Dsystemdsystemunitdir=no"
+ "-Dsession_tracking_consolekit=false"
+ "-Ddhcpcd=no"
+ "-Ddhcpcanon=no"
+ "-Dcrypto=gnutls"
+ "-Diwd=true"
+ "-Dlibaudit=yes"
+ "-Dqt=false"
+ "-Ddocs=true"
+ "--sysconfdir=/etc"
+ "--localstatedir=/var"
+ (string-append "-Dudev_dir="
+ out "/lib/udev")
+ (string-append "-Ddbus_conf_dir="
+ out "/etc/dbus-1/system.d")
+
+ (string-append "-Ddhclient=" dhclient)))
#: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
(lambda _
;; These tests try to test aspects of network-manager's
@@ -6409,61 +6409,64 @@ users.")
;; cope with being already in the Guix build jail as that jail
;; lacks some features that they would like to proxy over (like
;; a /sys mount).
- (substitute* '("Makefile.in")
- (("src/platform/tests/test-address-linux") " ")
- (("src/platform/tests/test-cleanup-linux") " ")
- (("src/platform/tests/test-link-linux") " ")
- (("src/platform/tests/test-route-linux") " ")
- (("src/devices/tests/test-acd") "")
- (("src/devices/tests/test-arping") " ")
- (("src/devices/tests/test-lldp") " ")
- (("src/tests/test-route-manager-linux") " "))
- #t))
- (add-after 'unpack 'delete-failing-tests
- (lambda _
- ;; FIXME: These three tests fail for unknown reasons.
- ;; ERROR:libnm-core/tests/test-general.c:5842:
- ;; _json_config_check_valid: assertion failed (res == expected): (1 == 0)
- ;; ERROR:libnm-core/tests/test-keyfile.c:647:
- ;; test_team_conf_read_invalid: assertion failed: (nm_setting_team_get_config (s_team) == NULL)
- ;; ERROR:libnm-core/tests/test-setting.c:907:
- ;; _test_team_config_sync: assertion failed: (nm_streq0 (nm_setting_team_get_runner (s_team), runner))
- (substitute* "Makefile.in"
- (("libnm-core/tests/test-general") " ")
- (("libnm-core/tests/test-keyfile") " ")
- (("libnm-core/tests/test-setting\\$\\(EXEEXT\\)") " "))
+ (substitute* "src/platform/tests/meson.build"
+ ((".*test-address-linux.*") "")
+ ((".*test-cleanup-linux.*") "")
+ ((".*test-link-linux.*") "")
+ ((".*test-route-linux.*") ""))
+ (substitute* "src/devices/tests/meson.build"
+ ((".*test-acd.*") "")
+ ((".*test-lldp.*") ""))
#t))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* (find-files "." ".*\\.(xsl|xml)")
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t)))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
- (replace 'install
+ (add-before 'install 'no-polkit-magic
+ ;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
(lambda _
- (invoke "make"
- "sysconfdir=/tmp"
- "rundir=/tmp"
- "statedir=/tmp"
- "nmstatedir=/tmp/nm"
- "install")
- #t)))))
+ (setenv "PKEXEC_UID" "something")
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (for-each (lambda (directory)
+ (copy-recursively (string-append out directory)
+ (string-append doc directory))
+ (delete-file-recursively
+ (string-append out directory)))
+ '("/share/doc" "/share/gtk-doc"))
+ #t))))))
(propagated-inputs
`(("glib" ,glib)))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+ `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+ ("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
+ ("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool)
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
+ ("vala" ,vala)
;; For testing.
("python" ,python-wrapper)
("python-dbus" ,python-dbus)
("python-pygobject" ,python-pygobject)))
(inputs
- `(("coreutils" ,coreutils) ; for ls
- ("curl" ,curl)
+ `(("curl" ,curl)
("cyrus-sasl" ,cyrus-sasl)
("dbus-glib" ,dbus-glib)
("dnsmasq" ,dnsmasq)
@@ -6479,6 +6482,7 @@ users.")
("libndp" ,libndp)
("libnl" ,libnl)
("libsoup" ,libsoup)
+ ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
("modem-manager" ,modem-manager)
("newt" ,newt) ;for the 'nmtui' console interface
("openresolv" ,openresolv) ; alternative resolv.conf manager
@@ -6495,7 +6499,11 @@ devices and connections, attempting to keep active network connectivity when
available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
devices, and provides VPN integration with a variety of different VPN
services.")
- (license license:gpl2+)
+ ;; “This NetworkManager project consists of the daemon, client tools, and
+ ;; libnm. libnm is licensed LGPL-2.1+, while the rest is licensed under
+ ;; GPL-2.0+.”
+ (license (list license:gpl2+
+ license:lgpl2.1+))
(properties '((upstream-name . "NetworkManager")))))
(define-public network-manager-openvpn
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:03 GMT) Full text and rfc822 format available.Message #79 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 05/15] gnu: modem-manager: Update to 1.12.10. Date: Fri, 22 May 2020 19:12:36 +0200
* gnu/packages/freedesktop.scm (modem-manager): Update to 1.12.10.
[arguments]: Remove arguments '--disable-more-warnings'.
---
gnu/packages/freedesktop.scm | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f00cb1e076..90154cbba9 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1115,7 +1115,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.10.8")
+ (version "1.12.10")
(source (origin
(method url-fetch)
(uri (string-append
@@ -1123,15 +1123,11 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "16hnl0sdriqgv4v30mfs64mdl9rw7lsh802zlm3ggwxxil3p9qfb"))))
+ "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
- `(,(string-append "--with-udev-base-dir=" %output "/lib/udev")
- ;; FIXME: Without this flag the build fails with "error: assignment
- ;; from incompatible pointer type" whenever the return value of
- ;; "g_object_ref" is assigned to "ctx->self".
- "--disable-more-warnings")))
+ `(,(string-append "--with-udev-base-dir=" %output "/lib/udev"))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
("gobject-introspection" ,gobject-introspection)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:03 GMT) Full text and rfc822 format available.Message #82 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 00/15] Update network-manager suite Date: Fri, 22 May 2020 19:12:31 +0200
Add 2 commits fixing gnome packages, remove the libnma licenses update and add
comments to the new flag for network-manager-vpnc.
Brice Waegeneire (15):
gnu: network-manager: Update to 1.24.0.
gnu: network-manager: Add iwd support.
gnu: network-manager: Switch to meson-build-system.
gnu: network-manager: Appease guix lint.
gnu: modem-manager: Update to 1.12.10.
gnu: libnma: Update to 1.8.28.
gnu: libnma: Update inputs.
gnu: libnma: Adjust indentation.
gnu: network-manager-openvpn: Update to 1.8.12.
gnu: network-manager-openconnect: Use libnma.
gnu: network-manager-vpnc: Use 'libnma'.
gnu: network-manager-applet: Update to 1.16.0.
gnu: network-manager-applet: Appease guix lint.
gnu: gnome-initial-setup: Use 'libnma'.
gnu: gnome-control-center: Use 'libnma'.
gnu/local.mk | 2 +-
gnu/packages/freedesktop.scm | 10 +-
gnu/packages/gnome.scm | 258 ++++++++++--------
...atch => network-manager-plugin-path.patch} | 0
4 files changed, 142 insertions(+), 128 deletions(-)
rename gnu/packages/patches/{nm-plugin-path.patch => network-manager-plugin-path.patch} (100%)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:03 GMT) Full text and rfc822 format available.Message #85 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 04/15] gnu: network-manager: Appease guix lint. Date: Fri, 22 May 2020 19:12:35 +0200
* gnu/packages/gnome.scm (network-manager)[home-page]: Use the permenant
redirect URL.
* gnu/packages/patches/nm-plugin-path.patch: Renamed to
'gnu/packages/patches/network-manager-plugin-path.patch'.
---
gnu/local.mk | 2 +-
gnu/packages/gnome.scm | 4 ++--
...nm-plugin-path.patch => network-manager-plugin-path.patch} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename gnu/packages/patches/{nm-plugin-path.patch => network-manager-plugin-path.patch} (100%)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1d9de9a57e..4609e86fc2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1296,7 +1296,7 @@ dist_patch_DATA = \
%D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
- %D%/packages/patches/nm-plugin-path.patch \
+ %D%/packages/patches/network-manager-plugin-path.patch \
%D%/packages/patches/nsis-env-passthru.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 33d4b38b14..b053326e95 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6356,7 +6356,7 @@ users.")
(uri (string-append "mirror://gnome/sources/NetworkManager/"
(version-major+minor version) "/"
"NetworkManager-" version ".tar.xz"))
- (patches (search-patches "nm-plugin-path.patch"))
+ (patches (search-patches "network-manager-plugin-path.patch"))
(sha256
(base32
"06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3"))
@@ -6492,7 +6492,7 @@ users.")
("util-linux" ,util-linux)
("elogind" ,elogind)))
(synopsis "Network connection manager")
- (home-page "https://www.gnome.org/projects/NetworkManager/")
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager")
(description
"NetworkManager is a system network service that manages your network
devices and connections, attempting to keep active network connectivity when
diff --git a/gnu/packages/patches/nm-plugin-path.patch b/gnu/packages/patches/network-manager-plugin-path.patch
similarity index 100%
rename from gnu/packages/patches/nm-plugin-path.patch
rename to gnu/packages/patches/network-manager-plugin-path.patch
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:04 GMT) Full text and rfc822 format available.Message #88 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 07/15] gnu: libnma: Update inputs. Date: Fri, 22 May 2020 19:12:38 +0200
* gnu/packages/gnome.scm (libnam)[arguments]: Remove 'glib-or-gtk?' and
add phase 'patch-docbook-xml'.
[native-inputs]: Add 'docboock-xml-4.3' and 'vala'.
[inputs]: Remove 'adwaita'icon-theme'.
squash! gnu: libnma: Update inputs and licenses.
---
gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2bf055c7fd..ec532dcd9b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -819,16 +819,26 @@ client devices can handle.")
"09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "libnma-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gtk-doc" ,gtk-doc)
("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gcr" ,gcr)
+ `(("gcr" ,gcr)
("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
@@ -837,11 +847,10 @@ client devices can handle.")
(description "Libnma is an applet library for Network Manager. It was
initially part of network-manager-applet and has now become a separate
project.")
- (home-page "https://gitlab.gnome.org/GNOME/libnma")
-
- ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
- ;; "LGPL-2.1+".
- (license license:gpl2+)))
+ (home-page "https://gitlab.gnome.org/GNOME/libnma")
+ ;; Some files carry the "GPL-2.0+" SPDX identifier while others say
+ ;; "LGPL-2.1+".
+ (license license:gpl2+)))
(define-public gnome-menus
(package
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:04 GMT) Full text and rfc822 format available.Message #91 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 08/15] gnu: libnma: Adjust indentation. Date: Fri, 22 May 2020 19:12:39 +0200
* gnu/packages/gnome.scm (libnma): Adjust indentation.
---
gnu/packages/gnome.scm | 76 +++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ec532dcd9b..72d2da72ec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -807,44 +807,44 @@ client devices can handle.")
(define-public libnma
(package
- (name "libnma")
- (version "1.8.28")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
- (build-system meson-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* "libnma-docs.xml"
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd")))
- #t))))))
- (native-inputs
- `(("docbook-xml" ,docbook-xml-4.3)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gtk-doc" ,gtk-doc)
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("vala" ,vala)))
- (inputs
- `(("gcr" ,gcr)
- ("gtk+" ,gtk+)
- ("iso-codes" ,iso-codes)
- ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
- ("network-manager" ,network-manager)))
- (synopsis "Network Manager's applet library")
- (description "Libnma is an applet library for Network Manager. It was
+ (name "libnma")
+ (version "1.8.28")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
+ (build-system meson-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "libnma-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t))))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
+ (inputs
+ `(("gcr" ,gcr)
+ ("gtk+" ,gtk+)
+ ("iso-codes" ,iso-codes)
+ ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
+ ("network-manager" ,network-manager)))
+ (synopsis "Network Manager's applet library")
+ (description "Libnma is an applet library for Network Manager. It was
initially part of network-manager-applet and has now become a separate
project.")
(home-page "https://gitlab.gnome.org/GNOME/libnma")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:05 GMT) Full text and rfc822 format available.Message #94 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 06/15] gnu: libnma: Update to 1.8.28. Date: Fri, 22 May 2020 19:12:37 +0200
* gnu/packages/gnome.scm (libnma): Update to 1.8.28.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b053326e95..2bf055c7fd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -808,7 +808,7 @@ client devices can handle.")
(define-public libnma
(package
(name "libnma")
- (version "1.8.26")
+ (version "1.8.28")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -816,7 +816,7 @@ client devices can handle.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1w9lld38risnk1krknfwln24kabdxnj274pyz4jhndphwigrshaf"))))
+ "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t))
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:05 GMT) Full text and rfc822 format available.Message #97 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 09/15] gnu: network-manager-openvpn: Update to 1.8.12. Date: Fri, 22 May 2020 19:12:40 +0200
* gnu/packages/gnome.scm (network-manager-openvpn): Update to 1.8.12.
[inputs]: Replace 'network-manager-applet' with 'libnma'.
---
gnu/packages/gnome.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 72d2da72ec..9bcba6572c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6518,8 +6518,7 @@ services.")
(define-public network-manager-openvpn
(package
(name "network-manager-openvpn")
- ;; Updating? Check whether network-manager-applet still needs libnm_gtk.
- (version "1.8.10")
+ (version "1.8.12")
(source (origin
(method url-fetch)
(uri (string-append
@@ -6528,7 +6527,7 @@ services.")
"/NetworkManager-openvpn-" version ".tar.xz"))
(sha256
(base32
- "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g"))))
+ "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
@@ -6558,7 +6557,7 @@ services.")
("kmod" ,kmod)
("openvpn" ,openvpn)
("network-manager" ,network-manager)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("libsecret" ,libsecret)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:05 GMT) Full text and rfc822 format available.Message #100 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 10/15] gnu: network-manager-openconnect: Use libnma. Date: Fri, 22 May 2020 19:12:41 +0200
* gnu/packages/gnome.scm (network-manager-openconnect)[native-inputs]:
Replace 'network-manager-applet' by 'libnma'.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9bcba6572c..78399921c5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6648,7 +6648,7 @@ Compatible with Cisco VPN concentrators configured to use IPsec.")
#t)))))
(native-inputs
`(("intltool" ,intltool)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("pkg-config" ,pkg-config)))
(inputs
`(("gcr" ,gcr)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:06 GMT) Full text and rfc822 format available.Message #103 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 11/15] gnu: network-manager-vpnc: Use 'libnma'. Date: Fri, 22 May 2020 19:12:42 +0200
* gnu/packages/gnome.scm (network-manager-vpnc)[arguments]: Add
configure flag '--with-libnm-glib=no'.
[inputs]: Replace 'network-manager-applet' with 'libnma'.
---
gnu/packages/gnome.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 78399921c5..f7a0acf312 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6582,7 +6582,10 @@ to virtual private networks (VPNs) via OpenVPN.")
"1js5lwcsqws4klgypfxl4ikmakv7v7xgddij1fj6b0y0qicx0kyy"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var")
+ `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"
+ ;; libnm-glib has been removed from network-manager
+ ;; 1de8383ad9fdfc8f552117e5d109bdfa7005634b
+ "--with-libnm-glib=no")
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-path
@@ -6606,7 +6609,7 @@ to virtual private networks (VPNs) via OpenVPN.")
("kmod" ,kmod)
("vpnc" ,vpnc)
("network-manager" ,network-manager)
- ("network-manager-applet" ,network-manager-applet) ;for libnma
+ ("libnma" ,libnma)
("libsecret" ,libsecret)))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "VPNC plug-in for NetworkManager")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:06 GMT) Full text and rfc822 format available.Message #106 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 12/15] gnu: network-manager-applet: Update to 1.16.0. Date: Fri, 22 May 2020 19:12:43 +0200
* gnu/packages/gnome.scm (netowrk-manager-applet): Update to 1.16.0.
[arguments]: Remove 'configure-flags'.
[inputs]: Add 'libnma', remove 'iso-codes' and
'mobile-broadband-provider-info'.
---
gnu/packages/gnome.scm | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f7a0acf312..c8a81dc4e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6700,7 +6700,7 @@ Cisco's AnyConnect SSL VPN.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
- (version "1.8.24")
+ (version "1.16.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/network-manager-applet/"
@@ -6708,13 +6708,10 @@ Cisco's AnyConnect SSL VPN.")
"network-manager-applet-" version ".tar.xz"))
(sha256
(base32
- "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi"))))
+ "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"))))
(build-system meson-build-system)
(arguments
- '(#:configure-flags
- ;; ‘Nobody should be using this’ but network-manager-openvpn 1.8.10 does.
- (list "-Dlibnm_gtk=true")
- #:glib-or-gtk? #t))
+ '(#:glib-or-gtk? #t))
(native-inputs
`(("intltool" ,intltool)
("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
@@ -6728,14 +6725,13 @@ Cisco's AnyConnect SSL VPN.")
("network-manager" ,network-manager)))
(inputs
`(("gcr" ,gcr)
- ("iso-codes" ,iso-codes)
+ ("libnma" ,libnma)
("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libselinux" ,libselinux)
("jansson" ,jansson) ; for team support
- ("modem-manager" ,modem-manager)
- ("mobile-broadband-provider-info" ,mobile-broadband-provider-info)))
+ ("modem-manager" ,modem-manager)))
(synopsis "Applet for managing network connections")
(home-page "https://www.gnome.org/projects/NetworkManager/")
(description
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:07 GMT) Full text and rfc822 format available.Message #109 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 13/15] gnu: network-manager-applet: Appease guix lint. Date: Fri, 22 May 2020 19:12:44 +0200
* gnu/packages/gnome.scm (network-manager-applet)[home-page]: Replace
with permanent redirect URL.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c8a81dc4e9..e891719582 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6733,7 +6733,7 @@ Cisco's AnyConnect SSL VPN.")
("jansson" ,jansson) ; for team support
("modem-manager" ,modem-manager)))
(synopsis "Applet for managing network connections")
- (home-page "https://www.gnome.org/projects/NetworkManager/")
+ (home-page "https://wiki.gnome.org/Projects/NetworkManager")
(description
"This package contains a systray applet for NetworkManager. It displays
the available networks and allows users to easily switch between them.")
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:07 GMT) Full text and rfc822 format available.Message #112 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 14/15] gnu: gnome-initial-setup: Use 'libnma'. Date: Fri, 22 May 2020 19:12:45 +0200
* gnu/packages/gnome.scm (gnome-initial-setup)[inputs]: Replace
'network-manager-applet' with 'libnma'.
---
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e891719582..b5c6308866 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -644,9 +644,9 @@ extraction, and lookup for applications on the desktop.")
("json-glib" ,json-glib)
("krb5" ,mit-krb5)
("libgweather" ,libgweather)
+ ("libnma" ,libnma)
("libsecret" ,libsecret)
("network-manager" ,network-manager)
- ("network-manager-applet" ,network-manager-applet)
("packagekit" ,packagekit)
("polkit" ,polkit)
("pwquality" ,libpwquality)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 17:14:07 GMT) Full text and rfc822 format available.Message #115 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: guix-patches <at> gnu.org Subject: [PATCH v2 15/15] gnu: gnome-control-center: Use 'libnma'. Date: Fri, 22 May 2020 19:12:46 +0200
* gnu/packages/gnome.scm (gnome-control-center)[inputs]: Add 'libnma'.
---
gnu/packages/gnome.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b5c6308866..7f06afcd31 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7122,6 +7122,7 @@ devices using the GNOME desktop.")
("libgnomekbd" ,libgnomekbd)
("libgudev" ,libgudev)
("libgtop" ,libgtop)
+ ("libnma" ,libnma)
("libpwquality" ,libpwquality)
("libsecret" ,libsecret)
("libsoup" ,libsoup)
--
2.26.2
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 18:21:01 GMT) Full text and rfc822 format available.Message #118 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de> To: guix-patches <at> gnu.org Subject: Re: [bug#41193] [PATCH 11/13] gnu: network-manager-vpnc: Use libnma. Date: Fri, 22 May 2020 20:20:52 +0200
On 11.05.20 22:01, Leo Famulari wrote:
> On Mon, May 11, 2020 at 09:00:44PM +0200, Brice Waegeneire wrote:
>> + `(#:configure-flags '("--enable-absolute-paths" "--localstatedir=/var"
>> + "--with-libnm-glib=no")
>
> Can you add a brief code comment explaining this configure flag?
And maybe one line per configure option :)
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 19:49:02 GMT) Full text and rfc822 format available.Message #121 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 11/13] gnu: network-manager-vpnc: Use libnma. Date: Fri, 22 May 2020 19:48:14 +0000
Jonathan Brielmaier wrote:
> On 11.05.20 22:01, Leo Famulari wrote:
>> On Mon, May 11, 2020 at 09:00:44PM +0200, Brice Waegeneire wrote:
>>> + `(#:configure-flags '("--enable-absolute-paths"
>>> "--localstatedir=/var"
>>> + "--with-libnm-glib=no")
>>
>> Can you add a brief code comment explaining this configure flag?
>
> And maybe one line per configure option :)
That snip is misleading, the package already had the two option on the
same
line. I'll leave it to the person pushing this to tweak that line or dot
it
myself if a v3 is needed.
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 20:05:02 GMT) Full text and rfc822 format available.Message #124 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH 00/13] Update network-manager suite Date: Fri, 22 May 2020 16:04:17 -0400
On Fri, May 22, 2020 at 04:35:52PM +0000, Brice Waegeneire wrote: > I tired running the test but even on master it fails, CI can't built it > either. But trying to built it with my patches I manage to find 2 gnome > packages that broke because of it: they were looking for libnma in > network-manager-applet which isn't included with it anymore. There aren't > any other packages directly depending on network-manager-applet so there > shouldn't be any other breakage relating to this specific issue. Okay. > sirmacik tested the patchset too and used the vpnc plugin fine but as me > he is not a user of the applet. Should we wait for the test to be fixed, > before going forward with this patchset? We don't need to wait, since we got some good test results from you and sirmacik. It would be great to get the test working again but I don't think it should block these patches.
guix-patches <at> gnu.org:bug#41193; Package guix-patches.
(Fri, 22 May 2020 20:06:01 GMT) Full text and rfc822 format available.Message #127 received at 41193 <at> debbugs.gnu.org (full text, mbox):
From: Leo Famulari <leo <at> famulari.name> To: Brice Waegeneire <brice <at> waegenei.re> Cc: 41193 <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH v2 00/15] Update network-manager suite Date: Fri, 22 May 2020 16:05:26 -0400
On Fri, May 22, 2020 at 07:12:31PM +0200, Brice Waegeneire wrote: > Add 2 commits fixing gnome packages, remove the libnma licenses update and add > comments to the new flag for network-manager-vpnc. Based on your previous messages and discussion on #guix IRC, please push!
Brice Waegeneire <brice <at> waegenei.re>:Brice Waegeneire <brice <at> waegenei.re>:Message #132 received at 41193-done <at> debbugs.gnu.org (full text, mbox):
From: Brice Waegeneire <brice <at> waegenei.re> To: Leo Famulari <leo <at> famulari.name> Cc: 41193-done <at> debbugs.gnu.org Subject: Re: [bug#41193] [PATCH v2 00/15] Update network-manager suite Date: Fri, 22 May 2020 21:23:01 +0000
On 2020-05-22 20:05, Leo Famulari wrote: > On Fri, May 22, 2020 at 07:12:31PM +0200, Brice Waegeneire wrote: >> Add 2 commits fixing gnome packages, remove the libnma licenses update >> and add >> comments to the new flag for network-manager-vpnc. > > Based on your previous messages and discussion on #guix IRC, please > push! Thank you! Pushed as 01c22be7bb48f0500ac5c9e16f8210222e9286ef.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Sat, 20 Jun 2020 11:24:09 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.