Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b34f17ac7c1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0032a3fc8156
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 15, 2020

  1. nixos/kresd: Fix unsupported regex 

    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.
    @griff
    griff committed Oct 15, 2020
    Copy the full SHA
    ab94ea6 View commit details

Commits on Mar 28, 2021

  1. Merge #100592: nixos/kresd: Fix unportable regex

    @vcunat
    vcunat committed Mar 28, 2021
    Copy the full SHA
    0032a3f View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/networking/kresd.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/kresd.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let
mkListen = kind: addr: let
al_v4 = builtins.match "([0-9.]+):([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)
(throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ];