summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-01-26 17:23:33 +0100
committerVladimír Čunát <v@cunat.cz>2022-01-26 17:23:33 +0100
commit7554997bf49da188cb87cdc25f513dc2e4913922 (patch)
tree1b5dd97704bc327a8944de0e5e82a5d83ea0b45c
parentMerge pull request #156834 from NixOS/backport-155725-to-release-21.11 (diff)
parentFix invalid regular expression #156861 (diff)
downloadnixpkgs-7554997bf49da188cb87cdc25f513dc2e4913922.tar.gz
Merge #156872: nixos/kresd: Fix invalid regular expression
... into release-21.11 The problem has only been confirmed to occur on *-darwin.
-rw-r--r--nixos/modules/services/networking/kresd.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index 16011573f8bb..28b8be7a9a0d 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -9,7 +9,7 @@ let
# On Nix level we don't attempt to precisely validate the address specifications.
# The optional IPv6 scope spec comes *after* port, perhaps surprisingly.
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_portOnly = builtins.match "([0-9]+)" addr;
al = findFirst (a: a != null)