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: d9b14864a54e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3172cc61f2a9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 1, 2019

  1. doc: Include function doc generation in Makefile 

    Since #53055 was merged the Makefile for the manual could not be run
correctly as the generated function documentation was included, but
not actually generated.

This adds the necessary generation step by first building the XML file
containing function locations and preserving its store path in a
variable, which is then used both for linking of the locations file
and as a build input for the function docs generator.

This fixes #55014
    @tazjin
    tazjin committed Feb 1, 2019
    Copy the full SHA
    29c320f View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Merge pull request #55040 from tazjin/docs/fix-manual-makefile 

    Fix manual Makefile by including function doc generation
    @samueldr
    samueldr committed Feb 10, 2019
    Copy the full SHA
    3172cc6 View commit details
    Browse the repository at this point in the history