lib/flags: Avoid attrset issue with string context
This commit is contained in:
parent
ad369da0f9
commit
9044b74987
1 changed files with 10 additions and 7 deletions
|
@ -1,25 +1,28 @@
|
|||
{ nixpkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (builtins) filter isList isString stringLength;
|
||||
inherit (nixpkgs.lib.lists) subtractLists;
|
||||
inherit (builtins)
|
||||
filter isList
|
||||
isString stringLength
|
||||
unsafeDiscardStringContext;
|
||||
|
||||
inherit (nixpkgs.lib.lists) flatten subtractLists;
|
||||
inherit (nixpkgs.lib.strings) addContextFrom;
|
||||
|
||||
split = strOrList:
|
||||
if isList strOrList then strOrList
|
||||
if isList strOrList then flatten strOrList
|
||||
else builtins.split "[[:space:]]+" strOrList
|
||||
|> filter (flag: isString flag && stringLength flag > 0)
|
||||
|> map (flag: addContextFrom strOrList flag);
|
||||
|> filter (flag: isString flag && stringLength flag > 0);
|
||||
|
||||
remerge = strOrList: list:
|
||||
if isList strOrList then list
|
||||
else toString list;
|
||||
else toString list |> addContextFrom strOrList;
|
||||
in {
|
||||
remove = rem: strOrList: split strOrList
|
||||
|> subtractLists rem
|
||||
|> remerge strOrList;
|
||||
|
||||
subst = sub: strOrList: split strOrList
|
||||
|> map (flag: sub.${flag} or flag)
|
||||
|> map (flag: sub.${unsafeDiscardStringContext flag} or flag)
|
||||
|> remerge strOrList;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue