Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 2c9c04fe4747
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ca720961f5a6
Choose a head ref
  • 8 commits
  • 14 files changed
  • 2 contributors

Commits on Oct 7, 2017

  1. docbook_{xml,xsl}*: propagate findXMLCatalogs

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    99af040 View commit details
    Browse the repository at this point in the history

  2. gtk_doc: replace catalog lookup hack 

    In the previous commit, we added a setup hook to docbook dtd and xsl
packages, that adds derivation’s catalog file to an environment variable.
That should, in theory, remove the need for declaring their catalogs manually.
Unfortunately, xmlcatalog utility expects exactly one catalog file, completely
disregarding the environment variable in non-interactive context. In the same
spirit, the design of gtk-doc m4 files only admits a single catalog file,
resulting in another ugly hack.
    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    407db7b View commit details
    Browse the repository at this point in the history

  3. conky: Rely on XML_CATALOG_FILES variable

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    7c690ae View commit details
    Browse the repository at this point in the history

  4. criu: Rely on XML_CATALOG_FILES variable

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    08b283b View commit details
    Browse the repository at this point in the history

  5. neomutt: Rely on XML_CATALOG_FILES variable

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    757c43f View commit details
    Browse the repository at this point in the history

  6. apt: Rely on XML_CATALOG_FILES variable

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    c3c844a View commit details
    Browse the repository at this point in the history

  7. drumstick: Rely on XML_CATALOG_FILES variable

    @jtojnar
    jtojnar committed Oct 7, 2017
    Copy the full SHA
    2cc8173 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #30189 from jtojnar/docbook-xml-catalogs-hook 

    Rely on XML_CATALOG_FILES variable for DocBook
    @Mic92
    Mic92 committed Oct 7, 2017
    Copy the full SHA
    ca72096 View commit details
    Browse the repository at this point in the history