Unverified Commit 39182edc authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #217196 from NixOS/linux-firmware-update

parents b3dfb9a0 fc9e3696

nixos/modules/hardware/all-firmware.nix

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ in { 
      ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware

        ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [

        rtl8723bs-firmware

      ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [

        rtw89-firmware

      ];

      hardware.wirelessRegulatoryDatabase = true;

    })

pkgs/os-specific/linux/firmware/linux-firmware/source.nix

+3 −3
Original line number Diff line number Diff line 
# This file is autogenerated! Run ./update.sh to regenerate.

{

  version = "20221214";

  sourceHash = "sha256-vljUwXekmCYAH932wfbJe/hC4TDPRQOgEiPTUMeUKLE=";

  outputHash = "sha256-h0cCqnl6XvSoeyq54JHvl45z7qe/7ZKrcMNJJeqVLMk=";

  version = "20230210";

  sourceHash = "sha256-sjUO+DTjAMszfCkNSYjLS+AbceIVPVVH0OEho5VOIFA=";

  outputHash = "sha256-ZcmMLenblgQngdYui0wNANXhB5a/z635nNXo/MO83R8=";

}

pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
{ stdenvNoCC, lib, fetchFromGitHub }:



stdenvNoCC.mkDerivation {

  pname = "rtw89-firmware";



  # TODO: probably remove after updating linux firmware

  # https://github.com/lwfinger/rtw89/commit/a2c113501a5a988683f236df1aa79ce40f29e1be

  version = "unstable-2021-10-21";



  src = fetchFromGitHub {

    owner = "lwfinger";

    repo = "rtw89";

    rev = "0684157cba90e36bff5bc61a59e7e87c359b5e5c";

    sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632";

  };



  dontBuild = true;



  installPhase = ''

    runHook preInstall



    mkdir -p $out/lib/firmware/rtw89

    cp *.bin $out/lib/firmware/rtw89



    runHook postInstall

  '';



  meta = with lib; {

    description = "Driver for Realtek 8852AE, an 802.11ax device";

    homepage = "https://github.com/lwfinger/rtw89";

    license = licenses.unfreeRedistributableFirmware;

    maintainers = with maintainers; [ tvorog ];

    platforms = platforms.linux;

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ mapAliases ({ 
  # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,

  # due to it being inside the linuxPackagesFor function.

  rtlwifi_new-firmware = rtw88-firmware; # Added 2021-03-14

  rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19



  ### S ###

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -26599,8 +26599,6 @@ with pkgs; 














  rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };



























  rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { };



























  rvvm = callPackage ../applications/virtualization/rvvm { };





























  s3ql = callPackage ../tools/backup/s3ql { };