diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-14 12:33:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-14 12:33:16 +0000 |
| commit | d7e181ff83f28f2e4b270deef08d7479c2d2bdfd (patch) | |
| tree | c3096e5483a314792534ad54c83489009851bc7b /doc | |
| parent | 2cc5ec86571c6f22ecb9d49f48b0b1ee2e160b52 (diff) | |
| parent | 0ed928e4aba48923f8a198c53ab445fbf8bd06c4 (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
pkgs/development/compilers/ocaml/4.12.nix
pkgs/development/python-modules/oci/default.nix
pkgs/tools/admin/bubblewrap/default.nix
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/functions/library/attrsets.xml | 2 | ||||
| -rw-r--r-- | doc/languages-frameworks/ocaml.section.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a30f4edf4c19..052bfa1f6ae3 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith <section xml:id="function-library-lib.attrsets.zipAttrs"> <title><function>lib.attrsets.zipAttrs</function></title> - <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal> + <subtitle><literal>zipAttrs :: [ AttrSet ] -> AttrSet</literal> </subtitle> <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" /> diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 47035551d418..e4813d7dd2d4 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -38,8 +38,8 @@ Here is a simple package example. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that the latest version of Dune is used for the - build (this may become the default value in a future release). +- `useDune2 = true` ensures that Dune version 2 is used for the + build (this is the default; set to `false` to use Dune version 1). - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is |