diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2023-10-04 01:24:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 01:24:04 +0200 |
| commit | 81e8f48ebdecf07aab321182011b067aafc78896 (patch) | |
| tree | f69b61bbe0efe5b3496aa7b09311903f9788e7f7 /lib/fileset | |
| parent | 72888446e9e3c86c414f59eb435500c780ff0c52 (diff) | |
| parent | d5743d926818a3e8cb43158c827d4aff409bf12c (diff) | |
Merge pull request #258855 from tweag/fileset.doc-fix
`lib.fileset.unions`: Fix outdated docs
Diffstat (limited to 'lib/fileset')
| -rw-r--r-- | lib/fileset/default.nix | 1 | ||||
| -rwxr-xr-x | lib/fileset/tests.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index ab26112c94709..f7d957bd264c1 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -258,7 +258,6 @@ If a directory does not recursively contain any file, it is omitted from the sto */ unions = # A list of file sets. - # Must contain at least 1 element. # The elements can also be paths, # which get [implicitly coerced to file sets](#sec-fileset-path-coercion). filesets: diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 525b8aaa91707..7fdbb3ede04f3 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -415,7 +415,7 @@ expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.u expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: element 0 \('"$work"'/a\) does not exist.' expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: element 1 \('"$work"'/b\) does not exist.' -# unions needs a list with at least 1 element +# unions needs a list expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Expected argument to be a list, but got a null.' # The tree of later arguments should not be evaluated if a former argument already includes all files |