diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-28 15:53:52 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-28 15:53:52 +0100 |
| commit | c61445357e2a92470bee43a71a10baef1a3196e4 (patch) | |
| tree | e14d8bac05ff82dae5ba69a1df4399bedf84c6ce /pkgs | |
| parent | 654d2e672d2ec77a75d00645c9fff92d40979aa0 (diff) | |
| parent | 8b7e150bb94fec38451eda20e644bda928caac9d (diff) | |
| download | nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar.gz nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar.bz2 nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar.lz nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar.xz nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.tar.zst nixpkgs-c61445357e2a92470bee43a71a10baef1a3196e4.zip | |
Merge pull request #14239 from kragniz/linux-testing-4.6-rc1
Linux-testing 4.6-rc1
Diffstat (limited to 'pkgs')
| -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 f3dd32386bc..e7e81f4877f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -210,7 +210,7 @@ with stdenv.lib; OCFS2_DEBUG_MASKLOG? n BTRFS_FS_POSIX_ACL y UBIFS_FS_ADVANCED_COMPR? y - ${optionalString (versionAtLeast version "4.0") '' + ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") '' NFSD_PNFS y ''} NFSD_V2_ACL y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 57a825ec0a0..e58230712a9 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.5-rc7"; - modDirVersion = "4.5.0-rc7"; - extraMeta.branch = "4.5"; + version = "4.6-rc1"; + modDirVersion = "4.6.0-rc1"; + extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq"; + sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0"; }; features.iwlwifi = true; |