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

Merge pull request #14239 from kragniz/linux-testing-4.6-rc1

Browse Source 
Linux-testing 4.6-rc1
This commit is contained in:
Domen Kožar 2016-03-28 15:53:52 +01:00
commit c61445357e
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

@ -210,7 +210,7 @@ with stdenv.lib;
OCFS2_DEBUG_MASKLOG? n OCFS2_DEBUG_MASKLOG? n
BTRFS_FS_POSIX_ACL y BTRFS_FS_POSIX_ACL y
UBIFS_FS_ADVANCED_COMPR? y UBIFS_FS_ADVANCED_COMPR? y
${optionalString (versionAtLeast version "4.0") '' ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") ''
NFSD_PNFS y NFSD_PNFS y
''} ''}
NFSD_V2_ACL y NFSD_V2_ACL 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.5-rc7"; version = "4.6-rc1";
modDirVersion = "4.5.0-rc7"; modDirVersion = "4.6.0-rc1";
extraMeta.branch = "4.5"; extraMeta.branch = "4.6";
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 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq"; sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0";
}; };
features.iwlwifi = true; features.iwlwifi = true;