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

linux-testing: 4.6-rc6 -> 4.7-rc6

Browse Source 
The config option DEVPTS_MULTIPLE_INSTANCES now no longer exists since
torvalds/linux@eedf265aa0.

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>
This commit is contained in:
aszlig 2016-07-04 10:40:28 +02:00
parent a783a5704f
commit 566c990f33
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ with stdenv.lib;
CGROUP_MEM_RES_CTLR y CGROUP_MEM_RES_CTLR y
CGROUP_MEM_RES_CTLR_SWAP y CGROUP_MEM_RES_CTLR_SWAP y
''} ''}
DEVPTS_MULTIPLE_INSTANCES y ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"}
BLK_DEV_THROTTLING y BLK_DEV_THROTTLING y
CFQ_GROUP_IOSCHED y CFQ_GROUP_IOSCHED y

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

@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args: { stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "4.6-rc6"; version = "4.7-rc6";
modDirVersion = "4.6.0-rc6"; modDirVersion = "4.7.0-rc6";
extraMeta.branch = "4.6"; extraMeta.branch = "4.7";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
sha256 = "040sk87zdgqsbma5sk1hk4graga8yafh4rn89vkznkwzdlwa3gyx"; sha256 = "1kli8m6xkpdp45ryx6aq894q5dvrl1s7h3g1akk0l7xp6grshk8r";
}; };
features.iwlwifi = true; features.iwlwifi = true;