diff options
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ef38043b8d65..cb6e45e52c8b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -36,6 +36,9 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y + # Unix domain sockets. + UNIX y + # Power management. ${optionalString (versionOlder version "3.19") '' PM_RUNTIME y @@ -137,6 +140,7 @@ with stdenv.lib; FB_3DFX_ACCEL y FB_VESA y FRAMEBUFFER_CONSOLE y + FRAMEBUFFER_CONSOLE_ROTATION y ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' FB_GEODE y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 43070f3306db..524c8b4ff250 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4-rc6"; - modDirVersion = "4.4.0-rc6"; + version = "4.4-rc7"; + modDirVersion = "4.4.0-rc7"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1brb1v6185pf8gnff753hvpdsbdmjr5nsbvj0s4ljlpcgljrn6cb"; + sha256 = "11lk368wqsj76djh4c70447hidldr16h28yb839lpx05z6dpzshx"; }; features.iwlwifi = true; |