From 9fbef499c86c42b1c837da3f6a047544deec0344 Mon Sep 17 00:00:00 2001 From: Jaiden Douglas Date: Sat, 13 Apr 2024 11:45:39 +0930 Subject: [PATCH 1/4] maintainers: add ja1den --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 10d33816136b..441300891901 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8854,6 +8854,15 @@ github = "j4m3s-s"; githubId = 9413812; }; + ja1den = { + name = "Jaiden Douglas"; + email = "contact@ja1den.me"; + github = "ja1den"; + githubId = 49811314; + keys = [{ + fingerprint = "CC36 4CF4 32DD 443F 27FC 033C 3475 AA20 D72F 6A93"; + }]; + }; jab = { name = "Joshua Bronson"; email = "jabronson@gmail.com"; From f35d326c66e6e4d49aebe46a9212fb006412c6fc Mon Sep 17 00:00:00 2001 From: Jaiden Douglas Date: Sat, 13 Apr 2024 12:25:38 +0930 Subject: [PATCH 2/4] rtl88xxau-aircrack: format with nixfmt --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 78409b7bd14a..1cf5ee241d8d 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; + description = '' + Aircrack-ng kernel module for Realtek 88XXau network cards + (8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support.''; homepage = "https://github.com/aircrack-ng/rtl8812au"; license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; From 0fe855112c83c2b047f33c04cf694ed21a735ec0 Mon Sep 17 00:00:00 2001 From: Jaiden Douglas Date: Sat, 13 Apr 2024 12:26:35 +0930 Subject: [PATCH 3/4] rtl88xxau-aircrack: add ja1den as maintainer --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 1cf5ee241d8d..44b299efdcaa 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { (8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support.''; homepage = "https://github.com/aircrack-ng/rtl8812au"; license = licenses.gpl2Only; - maintainers = [ maintainers.jethro ]; + maintainers = [ maintainers.ja1den maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; } From a6ae4b94ceaeb0a5066d3de8abb0e066d3425bfc Mon Sep 17 00:00:00 2001 From: Jaiden Douglas Date: Sat, 13 Apr 2024 14:56:04 +0930 Subject: [PATCH 4/4] rtl88xxau-aircrack: unstable-02-05-2023 -> unstable-2024-04-09 --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 44b299efdcaa..2f6ab211d32e 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; - version = "${kernel.version}-unstable-02-05-2023"; + version = "${kernel.version}-unstable-2024-04-09"; src = fetchFromGitHub { owner = "aircrack-ng"; repo = "rtl8812au"; - rev = "35308f4dd73e77fa572c48867cce737449dd8548"; - hash = "sha256-0kHrNsTKRl/xTQpDkIOYqTtcHlytXhXX8h+6guvLmLI="; + rev = "63cf0b4584aa8878b0fe8ab38017f31c319bde3d"; + hash = "sha256-tDsI/ZzsQm9999EpCpDFArfEIg/ueUJEbSYESbGxd4A="; }; nativeBuildInputs = kernel.moduleBuildDependencies;