From 79cacd6be4fb3d54aea2c9a1e73bb17ccde972c3 Mon Sep 17 00:00:00 2001 From: claymorwan Date: Thu, 4 Dec 2025 22:02:03 +0000 Subject: [PATCH 1/5] maintainers: add claymorwan --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9fb4f3493ab8..5d23f40286e8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4916,6 +4916,15 @@ githubId = 9336788; name = "Claes Hallström"; }; + claymorwan = { + name = "claymorwan"; + github = "claymorwan"; + githubId = 86072589; + email = "claymorwan@fembois.dev"; + keys = [{ + fingerprint = "AA7C 29C3 A26A DB2F 80E5 294D CC5E 1DF0 6FB7 8249"; + }]; + }; clebs = { email = "borja.clemente@gmail.com"; github = "clebs"; From c78066e872223d3fd71191e35afc7bf6303e8bf5 Mon Sep 17 00:00:00 2001 From: claymorwan Date: Thu, 4 Dec 2025 22:15:19 +0000 Subject: [PATCH 2/5] linuxPackages.rtl88x2bu: replace package source --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 83966fdc19d0..c67004f0d239 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -12,10 +12,10 @@ stdenv.mkDerivation { version = "${kernel.version}-unstable-2025-05-29"; src = fetchFromGitHub { - owner = "morrownr"; - repo = "88x2bu-20210702"; - rev = "fe48647496798cac77976e310ee95da000b436c9"; - hash = "sha256-h20vwCgLOiNh0LN3MGwPl3F/PSWGc2XS4t1sdeFAOko="; + owner = "RinCat"; + repo = "RTL88x2BU-Linux-Driver"; + rev = "825556e195ecde9ce8f5f4cbad9953f398c8598e"; + hash = "sha256-MkvVCWyMOCBzCRufbKMuaaFOPhokZdFnXHYnrAwBe6M="; }; hardeningDisable = [ "pic" ]; @@ -38,10 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/morrownr/88x2bu-20210702"; - license = licenses.gpl2Only; + homepage = "https://github.com/RinCat/RTL88x2BU-Linux-Driver"; + license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ otavio ]; - broken = kernel.kernelAtLeast "6.17"; + maintainers = with maintainers; [ otavio claymorwan ]; }; } From ae7eee0b98689d5239c9d98ad396c235f42e657b Mon Sep 17 00:00:00 2001 From: claymorwan Date: Thu, 4 Dec 2025 22:17:02 +0000 Subject: [PATCH 3/5] rtl88x2bu: unstable-2025-05-29 -> unstable-2025-12-4 --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index c67004f0d239..edb419287a3c 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2025-05-29"; + version = "${kernel.version}-unstable-2025-12-4"; src = fetchFromGitHub { owner = "RinCat"; From 868b45cc51ef0da7485ddf563682904b22ca7df3 Mon Sep 17 00:00:00 2001 From: claymorwan Date: Sat, 6 Dec 2025 14:09:08 +0000 Subject: [PATCH 4/5] rtl88x2bu: meta info fix --- maintainers/maintainer-list.nix | 8 +++++--- pkgs/os-specific/linux/rtl88x2bu/default.nix | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5d23f40286e8..7d22aeb63819 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4921,9 +4921,11 @@ github = "claymorwan"; githubId = 86072589; email = "claymorwan@fembois.dev"; - keys = [{ - fingerprint = "AA7C 29C3 A26A DB2F 80E5 294D CC5E 1DF0 6FB7 8249"; - }]; + keys = [ + { + fingerprint = "AA7C 29C3 A26A DB2F 80E5 294D CC5E 1DF0 6FB7 8249"; + } + ]; }; clebs = { email = "borja.clemente@gmail.com"; diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index edb419287a3c..f206d6101a37 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2025-12-4"; + version = "${kernel.version}-unstable-2025-12-04"; src = fetchFromGitHub { owner = "RinCat"; @@ -39,8 +39,11 @@ stdenv.mkDerivation { meta = with lib; { description = "Realtek rtl88x2bu driver"; homepage = "https://github.com/RinCat/RTL88x2BU-Linux-Driver"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ otavio claymorwan ]; + maintainers = with maintainers; [ + otavio + claymorwan + ]; }; } From 9b4efbec266c4fb7d510804f13c9bb720660dc40 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Mon, 8 Dec 2025 10:06:19 +0800 Subject: [PATCH 5/5] linuxPackages.rtl88x2bu: disable on kernel older than 5.11 --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index f206d6101a37..66e151e7d8c6 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { otavio claymorwan ]; + broken = kernel.kernelOlder "5.11"; }; }