From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxWC3-0006i5-3y for guix-patches@gnu.org; Mon, 10 Apr 2017 06:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxWBy-00033n-FG for guix-patches@gnu.org; Mon, 10 Apr 2017 06:05:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxWBy-00033i-Bx for guix-patches@gnu.org; Mon, 10 Apr 2017 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cxWBy-0001Q7-2e for guix-patches@gnu.org; Mon, 10 Apr 2017 06:05:02 -0400 Subject: bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <1491245640-28547-1-git-send-email-h.goebel@crazy-compilers.com> <1491245802-28648-1-git-send-email-h.goebel@crazy-compilers.com> Date: Mon, 10 Apr 2017 12:04:12 +0200 In-Reply-To: <1491245802-28648-1-git-send-email-h.goebel@crazy-compilers.com> (Hartmut Goebel's message of "Mon, 3 Apr 2017 20:56:40 +0200") Message-ID: <871st0efz7.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: Hartmut Goebel Cc: 26352@debbugs.gnu.org Hi Hartmut, Hartmut Goebel skribis: > * 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. Note that =E2=80=98pre-configure=E2=80=99, =E2=80=98fix-docbook=E2=80=99, a= nd =E2=80=98install=E2=80=99 are not fields of , so we normally don=E2=80=99t represent them this way in commit logs. > ;; cope with being already in the Guix build jail as that j= ail > ;; lacks some features that they would like to proxy over (= like > ;; a /sys mount). > - (substitute* '("src/platform/Makefile.in" > - "src/devices/Makefile.in") > - (("SUBDIRS =3D 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)) A couple of new tests are being skipped, this is for the same reason as the others, right? > + (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-x= sl) > + "/catalog.xml")))) Normally adding both libxml2 and libxslt as inputs would save you from writing this phase. Could you check that this is the case? If it is, please do that instead; otherwise, the new phase is OK, but best call it =E2=80=99set-xml-catalog-path=E2=80=99 and return #t. Thank you! Ludo=E2=80=99.