diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-30 19:39:59 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-30 19:39:59 +0200 |
commit | 983657087b739fd3fc735165e4f095f177218a6e (patch) | |
tree | 04bef23e3c7277477c99b9eb79a98ce6ba00d9b3 /pkgs/os-specific | |
parent | ea7e54be18510532458292c25263dfac53975db7 (diff) | |
parent | 72cf5a111916d72b8f1b37c40d4996e7b89145d8 (diff) | |
download | nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar.gz nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar.bz2 nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar.lz nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar.xz nixlib-983657087b739fd3fc735165e4f095f177218a6e.tar.zst nixlib-983657087b739fd3fc735165e4f095f177218a6e.zip |
Merge branch 'master' into staging
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 f783828f0319..8c8da674f4d5 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.12-rc2"; - modDirVersion = "4.12.0-rc2"; + version = "4.12-rc3"; + modDirVersion = "4.12.0-rc3"; extraMeta.branch = "4.12"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "18p68ig9irblbxbg68jz766158bxr81824q91mnf372i5z9irj9w"; + sha256 = "0jwhsmw4igf5iwf4qndqbjzayag2wj2riypzl0v3yrh5zkhfl4dm"; }; features.iwlwifi = true; |