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: aeff3080d02c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 06d0ba1ee9e4
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 10, 2017

  1. babeld module: separate default options by space 

    In the previous version multiple default values would generate an
invalid babeld config file since all options would be concatenated
without any separator.
    @andir
    andir committed Nov 10, 2017
    Copy the full SHA
    236a7c5 View commit details

  2. babeld module: support non-boolean default arguments 

    Previosuly only boolean values would be rendered properly. All other
values would cause an error. Even the example configuration did fail.
    @andir
    andir committed Nov 10, 2017
    Copy the full SHA
    5d90737 View commit details

  3. babeld module: updated example config 

    Previosuly the example config did feature the deprecated `wired`
paramter. Wired can now be configured using the `type` parameter.
    @andir
    andir committed Nov 10, 2017
    Copy the full SHA
    5feed06 View commit details

Commits on Nov 14, 2017

  1. Merge pull request #31477 from andir/fix-babeld-config 

    Fix babeld config
    @fpletz
    fpletz authored Nov 14, 2017
    Copy the full SHA
    06d0ba1 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 nixos/modules/services/networking/babeld.nix
8 changes: 5 additions & 3 deletions nixos/modules/services/networking/babeld.nix
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,10 @@ let

cfg = config.services.babeld;

conditionalBoolToString = value: if (isBool value) then (boolToString value) else (toString value);

paramsString = params:
concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}")
concatMapStringsSep " " (name: "${name} ${conditionalBoolToString (getAttr name params)}")
(attrNames params);

interfaceConfig = name:
@@ -49,7 +51,7 @@ in
type = types.nullOr (types.attrsOf types.unspecified);
example =
{
wired = true;
type = "tunnel";
"split-horizon" = true;
};
};
@@ -63,7 +65,7 @@ in
type = types.attrsOf (types.attrsOf types.unspecified);
example =
{ enp0s2 =
{ wired = true;
{ type = "wired";
"hello-interval" = 5;
"split-horizon" = "auto";
};