Merge master into staging-next

2021-01-14 12:42:20 +00:00
parent d247d74ff9 c1e1834ead
commit 730ff71234
26 changed files with 444 additions and 328 deletions
@@ -85,6 +85,6 @@ in
    ${lib.optionalString (documentationRoot != null) ''
    mkdir -p $out/${dataDhall}

-    XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --output-link $out/docs
+    XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs
    ''}
  ''