Unverified Commit 511bf566 authored by Justin !'s avatar Justin !
Browse files

treewide: fix or-as-identifier 

Lix will soon warn, and in the future, error when `or` is used as an
identifier. This commit fix those cases.
parent e1405b56

lib/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ let 
        const

        pipe

        concat

        or

        "or"

        and

        xor

        bitAnd

lib/options.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/trivial.nix

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ in 


    : 2\. Function argument

  */

  or = x: y: x || y;

  "or" = x: y: x || y;



  /**

    boolean “and”