auxolotl/lib
26
5
Fork 9
Code Issues 9 Pull requests 2 Projects Releases 3 Packages Wiki Activity Actions

Fix lix warnings for using "or" as an identifier

Browse source 
> warning: using or as an identifier is deprecated because it cannot be
> used in most places (try let or = 1; in or). Use
> --extra-deprecated-features or-as-identifier to disable this warning.

This is a bit of a hack, using quotes to silence the warning for now. It
does *work*, but only in places where it's not ambiguous anyways. Long
term, we should come up with a different name that doesn't conflict with
a keyword.
This commit is contained in:
5225225 2026-02-02 21:35:47 +00:00
parent 06b458ea7a
commit ac64c30345
Signed by: 5225225
SSH key fingerprint: SHA256:5yQwCyK6PNYKpYW6ng2Nq95/T1GS9IWvp4gdSVIixsg
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bools/default.nix
View file

@ -44,7 +44,7 @@ lib: {
/**
Perform a logical OR operation on two values.
*/
or = a: b: a || b;
"or" = a: b: a || b;
/**
Perform a logical OR operation on two functions being applied to a value.

8
src/bools/default.test.nix
View file

@ -117,25 +117,25 @@ in
"returns true when both are true" =
let
expected = true;
actual = lib.bools.or true true;
actual = lib.bools."or" true true;
in
actual == expected;
"returns true when first is true" =
let
expected = true;
actual = lib.bools.or true false;
actual = lib.bools."or" true false;
in
actual == expected;
"returns true when second is true" =
let
expected = true;
actual = lib.bools.or false true;
actual = lib.bools."or" false true;
in
actual == expected;
"returns false when both are false" =
let
expected = false;
actual = lib.bools.or false false;
actual = lib.bools."or" false false;
in
actual == expected;
};

2
src/options/default.nix
View file

@ -17,7 +17,7 @@ lib: {
mergedFunctions = x: lib.options.mergeDefault location (builtins.map (f: f x) values);
mergedLists = builtins.concatLists values;
mergedAttrs = builtins.foldl' lib.attrs.merge { } values;
mergedBools = builtins.any lib.bools.or false values;
mergedBools = builtins.any lib.bools."or" false values;
mergedStrings = lib.strings.concat values;
in
if builtins.length values == 1 then