diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 10:40:28 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 10:46:48 +0200 |
| commit | 566c990f3322929c779ce74329eb7fe2f93917d1 (patch) | |
| tree | de4faf40cec4ca4b92ae70de0e0c512df62118a8 /pkgs/os-specific/linux | |
| parent | a783a5704f8ec09041f24bb356812e1c7494c0d5 (diff) | |
| download | nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar.gz nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar.bz2 nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar.lz nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar.xz nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.tar.zst nixlib-566c990f3322929c779ce74329eb7fe2f93917d1.zip | |
linux-testing: 4.6-rc6 -> 4.7-rc6
The config option DEVPTS_MULTIPLE_INSTANCES now no longer exists since torvalds/linux@eedf265aa003b4781de24cfed40a655a664457e6. Built successfully on my Hydra instance: https://headcounter.org/hydra/log/r4n6sv0zld0aj65r7l494757s2r8w8sr-linux-4.7-rc6.drv Verified unpacked tarball with GnuPG: ABAF 11C6 5A29 70B1 30AB E3C4 79BE 3E43 0041 1886 gpg: Signature made Mon 04 Jul 2016 08:13:05 AM CEST gpg: using RSA key 79BE3E4300411886 gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>" Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 624d380fe568..1e9f2cb6a653 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -380,7 +380,7 @@ with stdenv.lib; CGROUP_MEM_RES_CTLR y CGROUP_MEM_RES_CTLR_SWAP y ''} - DEVPTS_MULTIPLE_INSTANCES y + ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"} BLK_DEV_THROTTLING y CFQ_GROUP_IOSCHED y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9a948a68c4cf..27e3681fdbae 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.6-rc6"; - modDirVersion = "4.6.0-rc6"; - extraMeta.branch = "4.6"; + version = "4.7-rc6"; + modDirVersion = "4.7.0-rc6"; + extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "040sk87zdgqsbma5sk1hk4graga8yafh4rn89vkznkwzdlwa3gyx"; + sha256 = "1kli8m6xkpdp45ryx6aq894q5dvrl1s7h3g1akk0l7xp6grshk8r"; }; features.iwlwifi = true; |