diff options
| author | Silvan Mosberger <github@infinisil.com> | 2026-01-02 00:18:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-02 00:18:56 +0000 |
| commit | ac62194c3917d5f474c1a844b6fd6da2db95077d (patch) | |
| tree | ddf35a506e1aaf621ad2631fc2a114e682c90ff6 | |
| parent | 8686c547e27c64ccb14a670f170cbdfee50108be (diff) | |
| parent | 272930fec6b63348fa8a7dc3e863b6b4b79ca728 (diff) | |
[Backport release-25.05] treewide: fix or-as-identifier (#475901)nixos-25.05-smallnixos-25.05
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/options.nix | 2 | ||||
| -rw-r--r-- | lib/trivial.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index 657545714448..6d4b8acd0ef9 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -119,7 +119,7 @@ let const pipe concat - or + "or" and xor bitAnd diff --git a/lib/options.nix b/lib/options.nix index 993cfb5525a1..8d9a0aee11ee 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -436,7 +436,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 diff --git a/lib/trivial.nix b/lib/trivial.nix index ada83b8fb4be..17a0c6917b8f 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -180,7 +180,7 @@ in : 2\. Function argument */ - or = x: y: x || y; + "or" = x: y: x || y; /** boolean “and” |