sokai/mynixos-extra-modules
1
0
Fork 0
forked from mirrors_public/oddlama_nixos-extra-modules
Code Pull requests Activity

chore: fix statix and deadnix warnings

Browse source
This commit is contained in:
Patrick 2025-04-15 11:29:18 +02:00
parent fb68031848
commit fda0b800e1
No known key found for this signature in database
GPG key ID: 451F95EFB8BECD0F
2 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/netu.nix
View file

@ -123,7 +123,7 @@ let
delta' = typechecks.numeric function "delta" delta; delta' = typechecks.numeric function "delta" delta;
mac' = typechecks.mac function "mac" mac; mac' = typechecks.mac function "mac" mac;
in in
builders.mac (implementations.mac.add delta' mac'); builders.mac (arithmetic.add delta' mac');
# diff :: mac -> mac -> integer # diff :: mac -> mac -> integer
# #
@ -141,7 +141,7 @@ let
minuend' = typechecks.mac function "minuend" minuend; minuend' = typechecks.mac function "minuend" minuend;
subtrahend' = typechecks.mac function "subtrahend" subtrahend; subtrahend' = typechecks.mac function "subtrahend" subtrahend;
in in
implementations.mac.diff minuend' subtrahend'; arithmetic.diff minuend' subtrahend';
# subtract :: (ip | mac | integer) -> mac -> mac # subtract :: (ip | mac | integer) -> mac -> mac
# #
@ -159,7 +159,7 @@ let
delta' = typechecks.numeric function "delta" delta; delta' = typechecks.numeric function "delta" delta;
mac' = typechecks.mac function "mac" mac; mac' = typechecks.mac function "mac" mac;
in in
builders.mac (implementations.mac.subtract delta' mac'); builders.mac (arithmetic.subtract delta' mac');
}; };
cidr = { cidr = {
@ -531,10 +531,10 @@ let
ap = liftA2 (a: a); ap = liftA2 (a: a);
# then_ :: parser a -> parser b -> parser b # then_ :: parser a -> parser b -> parser b
then_ = liftA2 (a: b: b); then_ = liftA2 (_: b: b);
# empty :: parser a # empty :: parser a
empty = string: null; empty = _: null;
# alt :: parser a -> parser a -> parser a # alt :: parser a -> parser a -> parser a
alt = alt =
@ -684,8 +684,6 @@ let
hextet = limit 4 hexadecimal; hextet = limit 4 hexadecimal;
hextet' = then_ colon hextet;
fromHextets = fromHextets =
hextets: hextets:
if builtins.length hextets != 8 then if builtins.length hextets != 8 then
@ -1076,7 +1074,7 @@ let
diff = diff =
a: b: a: b:
let let
toIPv6 = coerce ({ ipv6.a = 0; }); toIPv6 = coerce { ipv6.a = 0; };
result = (subtract b (toIPv6 a)).ipv6; result = (subtract b (toIPv6 a)).ipv6;
max32 = bit.left 32 1 - 1; max32 = bit.left 32 1 - 1;
in in
@ -1233,37 +1231,11 @@ let
(bit.left 32 value.ipv6.c) (bit.left 32 value.ipv6.c)
value.ipv6.d value.ipv6.d
] ]
else if value ? ipv4 then
value.ipv4
else if value ? mac then
value.mac
else else
value; value.ipv4 or value.mac or value;
}; };
implementations = { implementations = {
ip = {
# add :: (ip | mac | integer) -> ip -> ip
add = arithmetic.add;
# diff :: ip -> ip -> (ipv6 | integer)
diff = arithmetic.diff;
# subtract :: (ip | mac | integer) -> ip -> ip
subtract = arithmetic.subtract;
};
mac = {
# add :: (ip | mac | integer) -> mac -> mac
add = arithmetic.add;
# diff :: mac -> mac -> (ipv6 | integer)
diff = arithmetic.diff;
# subtract :: (ip | mac | integer) -> mac -> mac
subtract = arithmetic.subtract;
};
cidr = rec { cidr = rec {
# add :: (ip | mac | integer) -> cidr -> cidr # add :: (ip | mac | integer) -> cidr -> cidr
add = add =

2
lib/shift.nix
View file

@ -119,7 +119,7 @@ let
negate = b < 0; negate = b < 0;
mask = if a == 63 then intmax else (builtins.elemAt lut a) - 1; mask = if a == 63 then intmax else (builtins.elemAt lut a) - 1;
round_down = negate && (builtins.bitAnd mask b != 0); round_down = negate && (builtins.bitAnd mask b != 0);
result = (b / 2 / (builtins.elemAt lut (a - 1))); result = b / 2 / (builtins.elemAt lut (a - 1));
in in
if round_down then result - 1 else result; if round_down then result - 1 else result;
in in