treewide: fix or-as-identifier (#475723)

2026-01-11 18:32:23 +08:00 · 2026-01-01 13:27:44 +00:00
parent f63a8c7569 511bf56650
commit cb0c9a413f
3 changed files with 3 additions and 3 deletions
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -110,7 +110,7 @@ let
        const
        pipe
        concat
-        or
+        "or"
        and
        xor
        bitAnd
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -433,7 +433,7 @@ rec {
    else if all isAttrs list then
      foldl' lib.mergeAttrs { } list
    else if all isBool list then
-      foldl' lib.or false list
+      foldl' lib."or" false list
    else if all isString list then
      lib.concatStrings list
    else if all isInt list && all (x: x == head list) list then
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -197,7 +197,7 @@ in

    : 2\. Function argument
  */
-  or = x: y: x || y;
+  "or" = x: y: x || y;

  /**
    boolean “and”