diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-04 15:24:52 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-04 15:24:52 +0000 |
| commit | bbbaccfa68465b19c2aac7756233740b05935441 (patch) | |
| tree | b0df3b1f2378edc92d27edf5844f32a2bc01c1ae /pkgs/os-specific | |
| parent | f519a255a56e7c42d04d1beb666d685078cc7e18 (diff) | |
| parent | 84f3cd3e9bf90720c9d7067ae4f00ba61e4678ad (diff) | |
| download | nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar.gz nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar.bz2 nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar.lz nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar.xz nixlib-bbbaccfa68465b19c2aac7756233740b05935441.tar.zst nixlib-bbbaccfa68465b19c2aac7756233740b05935441.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e58230712a95..e3edaa43b8cd 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-rc1"; - modDirVersion = "4.6.0-rc1"; + version = "4.6-rc2"; + modDirVersion = "4.6.0-rc2"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0"; + sha256 = "0zihk9s1rkgmn0ghiz9xkg0w88w524af5mmad45rbxhm5751nxcr"; }; features.iwlwifi = true; |