nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 21:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125082 from ikervagyok/master

Browse Source
This commit is contained in:
Sandro 2021-06-15 13:49:48 +02:00 committed by GitHub
commit b7000df7ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -248,7 +248,7 @@ let
DRM_LOAD_EDID_FIRMWARE = yes; DRM_LOAD_EDID_FIRMWARE = yes;
VGA_SWITCHEROO = yes; # Hybrid graphics support VGA_SWITCHEROO = yes; # Hybrid graphics support
DRM_GMA500 = whenAtLeast "5.12" module; DRM_GMA500 = whenAtLeast "5.12" module;
DRM_GMA600 = yes; DRM_GMA600 = whenOlder "5.13" yes;
DRM_GMA3600 = whenOlder "5.12" yes; DRM_GMA3600 = whenOlder "5.12" yes;
DRM_VMWGFX_FBCON = yes; DRM_VMWGFX_FBCON = yes;
# necessary for amdgpu polaris support # necessary for amdgpu polaris support
@ -443,7 +443,7 @@ let
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
# Prevent processes from ptracing non-children processes # Prevent processes from ptracing non-children processes
SECURITY_YAMA = option yes; SECURITY_YAMA = option yes;
DEVKMEM = no; # Disable /dev/kmem DEVKMEM = whenOlder "5.13" no; # Disable /dev/kmem
USER_NS = yes; # Support for user namespaces USER_NS = yes; # Support for user namespaces
@ -698,7 +698,7 @@ let
THRUSTMASTER_FF = yes; THRUSTMASTER_FF = yes;
ZEROPLUS_FF = yes; ZEROPLUS_FF = yes;
MODULE_COMPRESS = yes; MODULE_COMPRESS = whenOlder "5.13" yes;
MODULE_COMPRESS_XZ = yes; MODULE_COMPRESS_XZ = yes;
SYSVIPC = yes; # System-V IPC SYSVIPC = yes; # System-V IPC

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.12-rc6"; version = "5.13-rc6";
extraMeta.branch = "5.12"; extraMeta.branch = "5.12";
# modDirVersion needs to be x.y.z, will always add .0 # modDirVersion needs to be x.y.z, will always add .0
@ -11,7 +11,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0w0zk2byimdbcvn8myqaq0ab6lyd43493fnkv9a1407dimpxb03d"; sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU=";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ];