Subject: Re: bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.

From: [email-masked] (Ludovic Courtès)
Date: Mon, 10 Apr 2017 12:04:12 +0200

Hi Hartmut,

Hartmut Goebel <[email-masked]> 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 ‘pre-configure’, ‘fix-docbook’, and ‘install’ are not fields
of <package>, so we normally don’t represent them this way in commit
logs.

>               ;; 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))

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-xsl)
> +                     "/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 ’set-xml-catalog-path’ and return #t.

Thank you!

Ludo’.