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

Commits on Nov 23, 2019

  1. make-options-doc: fix string context issues 

    When using `documentation.nixos.includeAllModules = true;` with external
modules, the string context might contain dependencies to derivations
and so `toFile` refuses to evaluate;

```
error: in 'toFile': the file 'options.xml' cannot refer to derivation outputs, at
[...]/nixpkgs/nixos/lib/make-options-doc/default.nix:89:16
```

This is not an issue when using `writeText` (instead of manually
stripping the context).
    @d-goldin
    d-goldin committed Nov 23, 2019
    Copy the full SHA
    3c15d57 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2019

  1. Merge pull request #73966 from d-goldin/nixosoptions_xml_strctx 

    make-options-doc: fix string context issues
    @domenkozar
    domenkozar committed Nov 25, 2019
    Copy the full SHA
    2c8c199 View commit details
    Browse the repository at this point in the history