dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/kresd: Fix unsupported regex

Browse Source 
Regex supported by `builtins.match` differ on Linux and Darwin
(see NixOS/Nix#1537) and the empty match group errors on Darwin.
But simply removing it does not change the logic in the module in any
way.
This commit is contained in:
Brian Olsen 2020-10-15 14:37:04 +02:00
parent b073b546ac
commit ab94ea66fa
No known key found for this signature in database
GPG Key ID: 029DD8E8B95882E8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/kresd.nix
View File

@ -10,7 +10,7 @@ let
mkListen = kind: addr: let mkListen = kind: addr: let
al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr; al_v4 = builtins.match "([0-9.]\+):([0-9]\+)" addr;
al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr; al_v6 = builtins.match "\\[(.\+)]:([0-9]\+)" addr;
al_portOnly = builtins.match "()([0-9]\+)" addr; al_portOnly = builtins.match "([0-9]\+)" addr;
al = findFirst (a: a != null) al = findFirst (a: a != null)
(throw "services.kresd.*: incorrect address specification '${addr}'") (throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ]; [ al_v4 al_v6 al_portOnly ];