diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix deleted file mode 100644 index b6ab883ca751..000000000000 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nukeReferences, kernel }: -with lib; -stdenv.mkDerivation rec { - name = "rtl8723bs-${kernel.version}-${version}"; - version = "2017-04-06"; - - src = fetchFromGitHub { - owner = "hadess"; - repo = "rtl8723bs"; - rev = "db2c4f61d48fe3b47c167c8bcd722ce83c24aca5"; - sha256 = "0pxqya14a61vv2v5ky1ldybc0mjfin9mpvmajlmv0lls904rph7g"; - }; - - hardeningDisable = [ "pic" ]; - - buildInputs = [ nukeReferences ]; - - makeFlags = [ - "ARCH=${stdenv.hostPlatform.linuxArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. - "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. - ]; - - enableParallelBuilding = true; - - # The Makefile doesn't use env-vars well, so install manually: - installPhase = '' - mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless - cp r8723bs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless - - nuke-refs $(find $out -name "*.ko") - ''; - - meta = { - description = "Realtek SDIO Wi-Fi driver"; - homepage = "https://github.com/hadess/rtl8723bs"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - broken = versionAtLeast kernel.version "4.12"; # Now in kernel staging drivers - maintainers = with maintainers; [ elitak ]; - }; -} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 9beff0671279..487cf29cf719 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -430,8 +430,6 @@ in { rtl8189fs = callPackage ../os-specific/linux/rtl8189fs { }; - rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; - rtl8723ds = callPackage ../os-specific/linux/rtl8723ds { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; @@ -563,6 +561,7 @@ in { } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 + rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; });