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: 1752a175e823
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 103ea99b9915
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 28, 2021

  1. nixos/gvpe: add types

    @Scriptkiddi @cole-h
    Scriptkiddi authored and cole-h committed Jan 28, 2021
    Copy the full SHA
    103ea99 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 nixos/modules/services/networking/gvpe.nix
8 changes: 7 additions & 1 deletion nixos/modules/services/networking/gvpe.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{config, pkgs, lib, ...}:

let
inherit (lib) mkOption mkIf;
inherit (lib) mkOption mkIf types;

cfg = config.services.gvpe;

@@ -46,12 +46,14 @@ in

nodename = mkOption {
default = null;
type = types.nullOr types.str;
description =''
GVPE node name
'';
};
configText = mkOption {
default = null;
type = types.nullOr types.lines;
example = ''
tcp-port = 655
udp-port = 655
@@ -72,26 +74,30 @@ in
};
configFile = mkOption {
default = null;
type = types.nullOr types.path;
example = "/root/my-gvpe-conf";
description = ''
GVPE config file, if already present
'';
};
ipAddress = mkOption {
default = null;
type = types.nullOr types.str;
description = ''
IP address to assign to GVPE interface
'';
};
subnet = mkOption {
default = null;
type = types.nullOr types.str;
example = "10.0.0.0/8";
description = ''
IP subnet assigned to GVPE network
'';
};
customIFSetup = mkOption {
default = "";
type = types.lines;
description = ''
Additional commands to apply in ifup script
'';