nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 06:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #312403 from alois31/rtw88

Browse Source
This commit is contained in:
Sandro 2024-07-31 13:14:18 +02:00 committed by GitHub
commit e4a6568004
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/hardware/all-firmware.nix
View File

@ -43,7 +43,6 @@ in {
rtl8192su-firmware
rt5677-firmware
rtl8761b-firmware
rtw88-firmware
zd1211fw
alsa-firmware
sof-firmware

25
pkgs/os-specific/linux/firmware/rtw88-firmware/default.nix
View File

@ -1,25 +0,0 @@
{ stdenvNoCC, lib, linuxPackages }:
stdenvNoCC.mkDerivation {
pname = "rtw88-firmware";
inherit (linuxPackages.rtw88) version src;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/lib/firmware/rtw88
cp *.bin $out/lib/firmware/rtw88
runHook postInstall
'';
meta = with lib; {
description = "Firmware for the newest Realtek rtlwifi codes";
homepage = "https://github.com/lwfinger/rtw88";
license = licenses.unfreeRedistributableFirmware;
maintainers = with maintainers; [ tvorog ];
platforms = platforms.linux;
};
}

6
pkgs/os-specific/linux/rtw88/default.nix
View File

@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation {
pname = "rtw88";
version = "unstable-2023-07-23";
version = "0-unstable-2024-07-27";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtw88";
rev = "9b6fe04a741a6b0a1edc5ca134927784bff033a5";
hash = "sha256-OzaIy+WTrljwAhC73wEIRUXrkz1NrGNJAS3zofQyV6E=";
rev = "610e04fc38343dcdcef95475c1579efc07572f1f";
hash = "sha256-54XhluBnspjyKR+OjYRa5g66N8F0d/oV3x89IV3zdT0=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;

1
pkgs/top-level/aliases.nix
View File

@ -1296,6 +1296,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
rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
rtw89-firmware = throw "rtw89-firmware has been removed because linux-firmware now contains it."; # Added 2023-02-19
### S ###

2
pkgs/top-level/all-packages.nix
View File

@ -27370,8 +27370,6 @@ with pkgs;
rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
rvvm = callPackage ../applications/virtualization/rvvm { };
s3ql = callPackage ../tools/backup/s3ql { };