tvl-depot/nix
Vincent Ambo da648b4707 docs(nix-1p): add section about the merge operator
Without the examples, some behaviour of the merge operator might not
be clear from the previous description. Due to how pervasively the
operator is used, I think it warrants a separate section.

This fixes https://github.com/tazjin/nix-1p/issues/16

Change-Id: Iecba5f1cb749bef0a4987b3fc5642832a92c18d5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9599
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
2023-10-10 11:18:25 +00:00
..
binify style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
bufCheck refactor(tvix): move castore into tvix-castore crate 2023-09-22 12:51:21 +00:00
buildGo chore(nix/buildGo): drop thing.proto from example 2022-12-26 11:38:52 +00:00
buildkite feat(nix/buildkite): add meta.ci.buildkiteExtraStepArgs 2023-07-24 20:51:14 +00:00
buildLisp chore: remove comments formerly meant for alignment 2023-05-31 10:55:07 +00:00
buildManPages chore(gerrit): migrate OWNERS files to code-owners style 2022-09-19 11:13:28 +00:00
dependency-analyzer refactor(nix/dependency-analyzer): use unsafeDiscardOutputDependency 2022-10-20 18:21:25 +00:00
drvSeqL style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
emptyDerivation chore(gerrit): migrate OWNERS files to code-owners style 2022-09-19 11:13:28 +00:00
escapeExecline style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
getBins style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
lazy-deps feat(nix/lazy-deps): add override pattern for deps 2023-04-24 10:56:40 +00:00
mergePatch style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
netstring style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
nint chore(gerrit): migrate OWNERS files to code-owners style 2022-09-19 11:13:28 +00:00
nix-1p docs(nix-1p): add section about the merge operator 2023-10-10 11:18:25 +00:00
readTree feat(nix/readTree): implement .skip-tree marker for subtree ignoring 2023-02-28 12:15:33 +00:00
renderMarkdown feat(nix/renderMarkdown): add optional tagfilter argument 2023-09-08 13:51:26 +00:00
runExecline style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
runTestsuite style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
sparseTree feat(nix/sparseTree): add optional name argument 2023-08-08 20:11:56 +00:00
stateMonad refactor(nix/stateMonad): optimize after 2022-10-08 10:59:45 +00:00
tag fix(nix/tag): correct no match check in discr 2022-10-09 13:25:14 +00:00
tailscale style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
utils revert(nix/utils): onlyDrvPath to get the drvPath w/o the outputs 2022-11-09 15:36:29 +00:00
writeElispBin chore(3p/sources): Bump channels and overlays 2022-04-21 16:54:07 +00:00
writeExecline style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
writers style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
writeScript style: format entire depot with nixpkgs-fmt 2022-01-31 16:11:53 +00:00
writeScriptBin refactor(nix): use our own writeScript(Bin) 2020-06-30 00:19:27 +00:00
yants docs(yants): Update josh cloning instructions 2022-02-19 11:37:00 +00:00
OWNERS chore(gerrit): migrate OWNERS files to code-owners style 2022-09-19 11:13:28 +00:00