From 08ced9d67f579684c4886acb696ee79e9e27303b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 15 Apr 2021 18:13:18 +0200 Subject: nixos/wpa_supplicant: make new behavior opt-in --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 8bfe947abb9..51af6abde8c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl , dbus, readline ? null, pcsclite ? null + +, readOnlyModeSSIDs ? false }: with lib; @@ -43,6 +45,7 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15"; sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg"; }) + ] ++ lib.optionals readOnlyModeSSIDs [ # Allow read-only networks ./0001-Implement-read-only-mode-for-ssids.patch ]; @@ -136,7 +139,7 @@ stdenv.mkDerivation rec { homepage = "https://w1.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber ]; + maintainers = with maintainers; [ marcweber ma27 ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13be95c1d87..e87e80d94d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20859,6 +20859,10 @@ in wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; + wpa_supplicant_ro_ssids = wpa_supplicant.override { + readOnlyModeSSIDs = true; + }; + wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { }; -- cgit 1.4.1