diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-15 12:01:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-15 12:01:37 +0000 |
commit | 14262b89f6e21f83fb50e75729bc06882a58b137 (patch) | |
tree | 49c1858a8b4350842bcd34a83c1041628f06965b /pkgs/tools/networking | |
parent | c25b566037fe377dda725c0e7868f79ccd28f1d8 (diff) | |
parent | ab7d9b5474e8f34c845dc03847d421e54265a315 (diff) | |
download | nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar.gz nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar.bz2 nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar.lz nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar.xz nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.tar.zst nixlib-14262b89f6e21f83fb50e75729bc06882a58b137.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/hostapd-mana/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/snowflake/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/tools/networking/hostapd-mana/default.nix index 56527fb15531..2ca826314c57 100644 --- a/pkgs/tools/networking/hostapd-mana/default.nix +++ b/pkgs/tools/networking/hostapd-mana/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sensepost/hostapd-mana"; description = "A featureful rogue wifi access point tool"; license = licenses.bsd3; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 556a3101cb65..cac350ff597a 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "System to defeat internet censorship"; homepage = "https://snowflake.torproject.org/"; changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ lourkeur yayayayaka ]; + maintainers = with maintainers; [ bbjubjub yayayayaka ]; license = licenses.bsd3; }; } |