From 40eaff5836b52574a210270ed574a5898e4b6a82 Mon Sep 17 00:00:00 2001 From: peelz Date: Mon, 14 Dec 2020 18:35:56 -0500 Subject: [PATCH 1/2] r8125: 9.003.05 -> 9.004.01 --- pkgs/os-specific/linux/r8125/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 8cdf11f80ad..80c00905876 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "r8125"; # On update please verify (using `diff -r`) that the source matches the # realtek version. - version = "9.003.05"; + version = "9.004.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software src = fetchFromGitHub { - owner = "ibmibmibm"; + owner = "louistakepillz"; repo = "r8125"; rev = version; - sha256 = "016vh997xjs01si0zzs572vgflq3czxd0v4m7h1m3qxcv2cvq7i0"; + sha256 = "0h2y4mzydhc7var5281bk2jj1knig6i64k11ii4b94az3g9dbq24"; }; hardeningDisable = [ "pic" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildFlags = [ "modules" ]; meta = with lib; { - homepage = "https://github.com/ibmibmibm/r8125"; + homepage = "https://github.com/louistakepillz/r8125"; downloadPage = "https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"; description = "Realtek r8125 driver"; longDescription = '' From 03471b0e1c714e88f1041e73da2142f36e7adeb0 Mon Sep 17 00:00:00 2001 From: peelz Date: Thu, 31 Dec 2020 15:05:57 -0500 Subject: [PATCH 2/2] r8125: add broken check for kernel >=5.9.1 --- pkgs/os-specific/linux/r8125/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix index 80c00905876..30f8da7d5f4 100644 --- a/pkgs/os-specific/linux/r8125/default.nix +++ b/pkgs/os-specific/linux/r8125/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { longDescription = '' A kernel module for Realtek 8125 2.5G network cards. ''; + # r8125 has been integrated into the kernel as of v5.9.1 + broken = lib.versionAtLeast kernel.version "5.9.1"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ peelz ];