Merge pull request NixOS#258855 from tweag/fileset.doc-fix

`lib.fileset.unions`: Fix outdated docs
MatrixAI · Oct 3, 2023 · 81e8f48 · 81e8f48
2 parents 7288844 + d5743d9
commit 81e8f48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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