mikael/idiosyn
mikael/idiosyn
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lib/flags: Avoid attrset issue with string context

Browse source
This commit is contained in:
Mikael 2024-08-24 15:09:07 +02:00
parent ad369da0f9
commit 9044b74987
Signed by: mikael
SSH key fingerprint: SHA256:21QyD2Meiot7jOUVitIR5YkGB/XuXdCvLW1hE6dsri0
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/flags.nix
View file

@ -1,25 +1,28 @@
{ nixpkgs, ... }: { nixpkgs, ... }:
let let
inherit (builtins) filter isList isString stringLength; inherit (builtins)
inherit (nixpkgs.lib.lists) subtractLists; filter isList
isString stringLength
unsafeDiscardStringContext;
inherit (nixpkgs.lib.lists) flatten subtractLists;
inherit (nixpkgs.lib.strings) addContextFrom; inherit (nixpkgs.lib.strings) addContextFrom;
split = strOrList: split = strOrList:
if isList strOrList then strOrList if isList strOrList then flatten strOrList
else builtins.split "[[:space:]]+" strOrList else builtins.split "[[:space:]]+" strOrList
|> filter (flag: isString flag && stringLength flag > 0) |> filter (flag: isString flag && stringLength flag > 0);
|> map (flag: addContextFrom strOrList flag);
remerge = strOrList: list: remerge = strOrList: list:
if isList strOrList then list if isList strOrList then list
else toString list; else toString list |> addContextFrom strOrList;
in { in {
remove = rem: strOrList: split strOrList remove = rem: strOrList: split strOrList
|> subtractLists rem |> subtractLists rem
|> remerge strOrList; |> remerge strOrList;
subst = sub: strOrList: split strOrList subst = sub: strOrList: split strOrList
|> map (flag: sub.${flag} or flag) |> map (flag: sub.${unsafeDiscardStringContext flag} or flag)
|> remerge strOrList; |> remerge strOrList;
} }