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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2020-12-30 00:53:01 +00:00
committed by GitHub
parent ff873c7c21 3c08a64b7d
commit 31fc475812
28 changed files with 211 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+7 -7
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchgit, lib }:
{ stdenvNoCC, fetchgit, lib }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
version = "2020-11-18";
version = "2020-12-18";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = lib.replaceStrings ["-"] [""] version;
sha256 = "107p7h13gncsxqhixqq9zmmswvs910sck54ab10s4m5cafvnaf94";
sha256 = "1rb5b3fzxk5bi6kfqp76q1qszivi0v1kdz1cwj2llp5sd9ns03b5";
};
installFlags = [ "DESTDIR=$(out)" ];
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "1319qr3mhbbvbnl8q151pgfpahwzfv9zg0fvpj34z5h0wnvmlr2v";
outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146";
meta = with stdenv.lib; {
meta = with stdenvNoCC.lib; {
description = "Binary firmware collection packaged by kernel.org";
homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";
homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
license = licenses.unfreeRedistributableFirmware;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz ];
pkgs/os-specific/linux/rtl8821cu/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, kernel, bc }:
stdenv.mkDerivation rec {
name = "rtl8821cu-${kernel.version}-${version}";
version = "unstable-2020-08-21";
version = "unstable-2020-12-21";
src = fetchFromGitHub {
owner = "brektrou";
repo = "rtl8821cu";
rev = "45a8b4393e3281b969822c81bd93bdb731d58472";
sha256 = "1995zs1hvlxjhbh2w7zkwr824z19cgc91s00g7yhm5d7zjav14rd";
rev = "428a0820487418ec69c0edb91726d1cf19763b1e";
sha256 = "1ccl94727yq7gzn37ky91k0736cambgnkaa37r2f2hinpl9qdd8q";
};
hardeningDisable = [ "pic" ];