From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cv7A2-0007eR-Md for guix-patches@gnu.org; Mon, 03 Apr 2017 14:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cv79z-00026w-IS for guix-patches@gnu.org; Mon, 03 Apr 2017 14:57:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cv79z-00026g-Dj for guix-patches@gnu.org; Mon, 03 Apr 2017 14:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cv79z-0005Ze-7D for guix-patches@gnu.org; Mon, 03 Apr 2017 14:57:03 -0400 Subject: bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2. References: <1491245640-28547-1-git-send-email-h.goebel@crazy-compilers.com> In-Reply-To: <1491245640-28547-1-git-send-email-h.goebel@crazy-compilers.com> Resent-Message-ID: From: Hartmut Goebel Date: Mon, 3 Apr 2017 20:56:40 +0200 Message-Id: <1491245802-28648-1-git-send-email-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26352@debbugs.gnu.org * gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2 [pre-configure]: Adopt to now used single Makefile.in. [fix-docbook]: New phase, required for docbook-xsl catalogs. [install]: Also pass "nmstatedir". [native-inputs]: Add docbook-xsl, libxslt. [inputs]: Add jansson. --- gnu/packages/gnome.scm | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b94c366..51d84a4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -4549,7 +4550,7 @@ users.") (define-public network-manager (package (name "network-manager") - (version "1.4.4") + (version "1.6.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -4557,7 +4558,7 @@ users.") "NetworkManager-" version ".tar.xz")) (sha256 (base32 - "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2")) + "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj")) (snippet '(begin (use-modules (guix build utils)) @@ -4574,7 +4575,7 @@ users.") (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") @@ -4601,13 +4602,22 @@ 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* '("src/platform/Makefile.in" - "src/devices/Makefile.in") - (("SUBDIRS = tests") "")) - (substitute* '("src/tests/Makefile.in") - (("\ttest-route-manager-linux") "\t") - (("\ttest-route-manager-fake") "\t")) + (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-arping") " ") + (("src/devices/tests/test-lldp") " ") + (("src/tests/test-route-manager-linux") " ")) #t)) + (add-before 'configure 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XML_CATALOG_FILES" + (string-append + (assoc-ref %build-inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl) + "/catalog.xml")))) (add-before 'check 'pre-check (lambda _ ;; For the missing /etc/machine-id. @@ -4619,13 +4629,16 @@ users.") "sysconfdir=/tmp" "rundir=/tmp" "statedir=/tmp" + "nmstatedir=/tmp/nm" "install"))))))) (propagated-inputs `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen ("gobject-introspection" ,gobject-introspection) + ("docbook-xsl" ,docbook-xsl) ("intltool" ,intltool) + ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) ;; For testing. ("python" ,python-wrapper) @@ -4637,6 +4650,7 @@ users.") ("gnutls" ,gnutls) ("iptables" ,iptables) ("isc-dhcp" ,isc-dhcp) + ("jansson" ,jansson) ("libgcrypt" ,libgcrypt) ("libgudev" ,libgudev) ("libndp" ,libndp) -- 2.7.4