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

Commits on Aug 9, 2018

  1. nixos/wireless: add extraConfig section to networking.wireless 

    This allows the user to add `wpa_supplicant` config options not yet supported by Nix without having to write the entire `wpa_supplicant.conf` file manually.
    @dmanam
    dmanam committed Aug 9, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moser-ss Stephane Moser
    GPG key ID: 51EA3CB018868B76
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d61282 View commit details

Commits on Aug 10, 2018

  1. Merge pull request #44658 from dlahoti/patch-2 

    add `extraConfig` section to `networking.wireless`
    @fpletz
    fpletz authored Aug 10, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moser-ss Stephane Moser
    GPG key ID: D8EC4CC760EEE98B
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f167e88 View commit details
Showing with 12 additions and 0 deletions.
  1. +12 −0 nixos/modules/services/networking/wpa_supplicant.nix
12 changes: 12 additions & 0 deletions nixos/modules/services/networking/wpa_supplicant.nix
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ let
${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''}
${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
key = if psk != null
then ''"${psk}"''
@@ -165,6 +166,17 @@ in {
description = "Members of this group can control wpa_supplicant.";
};
};
extraConfig = mkOption {
type = types.str;
default = "";
example = ''
p2p_disabled=1
'';
description = ''
Extra lines appended to the configuration file.
See wpa_supplicant.conf(5) for available options.
'';
};
};
};