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

Merge branch 'staging-next'

Browse Source 
Status on Hydra for linuxes seems good enough:
https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
This commit is contained in:
Vladimír Čunát
2020-05-06 08:20:05 +02:00
parent ee8cde8d1c 1906fc5bd1
commit 54eb2d1018
177 changed files with 652 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/common-config.nix
+21
View File
@@ -254,6 +254,27 @@ let
SND_USB_CAIAQ_INPUT = yes;
# Enable PSS mixer (Beethoven ADSP-16 and other compatible)
PSS_MIXER = whenOlder "4.12" yes;
# Enable Sound Open Firmware support
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" &&
versionAtLeast version "5.5") {
SND_SOC_SOF_TOPLEVEL = yes;
SND_SOC_SOF_ACPI = module;
SND_SOC_SOF_PCI = module;
SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes;
SND_SOC_SOF_CANNONLAKE_SUPPORT = yes;
SND_SOC_SOF_COFFEELAKE_SUPPORT = yes;
SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes;
SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes;
SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes;
SND_SOC_SOF_GEMINILAKE_SUPPORT = yes;
SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes;
SND_SOC_SOF_HDA_LINK = yes;
SND_SOC_SOF_ICELAKE_SUPPORT = yes;
SND_SOC_SOF_INTEL_TOPLEVEL = yes;
SND_SOC_SOF_JASPERLAKE_SUPPORT = yes;
SND_SOC_SOF_MERRIFIELD_SUPPORT = yes;
SND_SOC_SOF_TIGERLAKE_SUPPORT = yes;
};
usb-serial = {
pkgs/os-specific/linux/kernel/manual-config.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio
, utillinux
, utillinuxMinimal
, writeTextFile
}:
@@ -281,7 +281,7 @@ let
in
assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null;
stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // {
pname = "linux";
inherit version;
@@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
;