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

Commits on May 15, 2019

  1. haskell: servant: Don't hardcode $doc.

    Until now this broke on `enableSeparateDocOutput = false`,
    as then `$doc` was not defined so it tried to copy stuff to
    `/share/doc/servant`.
    
    Fixes regression introduced in commit be63b19.
    nh2 committed May 15, 2019
    Copy the full SHA
    0ef2bbf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #61526 from nh2/servant-doc-no-haddock-fix

    haskell: servant: Don't write to $doc if disabled.
    matthewbauer committed May 15, 2019
    Copy the full SHA
    d0ea2df View commit details
    Browse the repository at this point in the history