public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-07-27 06:03:10 +00:00 committed by GitHub
parent 0744732cab 0aa5191556
commit 770db2f4e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/hydroxide/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hydroxide";
version = "0.2.18";
version = "0.2.19";
src = fetchFromGitHub {
owner = "emersion";
repo = pname;
rev = "v${version}";
sha256 = "sha256-s8EmoVZUUeaKTaINXvKO5tSdPUS3MlhEucwnmTTC3Wk=";
sha256 = "sha256-FKZdsFEUlXk0w11v7Y6sKiu4bOjmau2yAifcTpN0J+U=";
};
vendorSha256 = "sha256-jkiTpDsJN628YKkFZcng9P05hmNUc3UeFsanLf+QtJY=";

25
pkgs/os-specific/linux/firmware/rtw89-firmware/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenvNoCC, lib, linuxPackages }:
stdenvNoCC.mkDerivation {
pname = "rtw89-firmware";
inherit (linuxPackages.rtw89) version src;
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;
};
}

40
pkgs/os-specific/linux/rtw89/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ stdenv, lib, fetchFromGitHub, kernel }:
let
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtw89";
in
stdenv.mkDerivation {
pname = "rtw89";
version = "unstable-2021-07-03";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtw89";
rev = "cebafc6dc839e66c725b92c0fabf131bc908f607";
sha256 = "1vw67a423gajpzd5d51bxnja1qpppx9x5ii2vcfkj6cbnqwr83af";
};
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
mkdir -p ${modDestDir}
find . -name '*.ko' -exec cp --parents {} ${modDestDir} \;
find ${modDestDir} -name '*.ko' -exec xz -f {} \;
runHook postInstall
'';
meta = with lib; {
description = " Driver for Realtek 8852AE, an 802.11ax device";
homepage = "https://github.com/lwfinger/rtw89";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ tvorog ];
platforms = platforms.linux;
broken = kernel.kernelOlder "5.4";
priority = -1;
};
}

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

@ -20624,6 +20624,8 @@ in
rtw88 = callPackage ../os-specific/linux/rtw88 { };
rtlwifi_new = rtw88;
rtw89 = callPackage ../os-specific/linux/rtw89 { };
openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { };
openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { };
# Current stable release; don't backport release updates!
@ -21212,6 +21214,8 @@ in
rtw88-firmware = callPackage ../os-specific/linux/firmware/rtw88-firmware { };
rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { };
s3ql = callPackage ../tools/backup/s3ql { };
sass = callPackage ../development/tools/sass { };