diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 18:59:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 18:59:08 +0100 |
| commit | daf3297cb46f73522d021e22c4dc7e0eb6920333 (patch) | |
| tree | 75d39f6f6933dafd9ac36e4082526075906271c1 /pkgs/os-specific | |
| parent | 917400bcffd3a4179c4789a91857a5f1420081dd (diff) | |
| parent | 968b20e2c7405f27830b6f10a8cac975e965dc94 (diff) | |
| download | nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.gz nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.bz2 nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.lz nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.xz nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.zst nixlib-daf3297cb46f73522d021e22c4dc7e0eb6920333.zip | |
Merge master into staging-next
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 ad7e44ed0a17..9c8d44530875 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.20-rc1"; - modDirVersion = "4.20.0-rc1"; + version = "4.20-rc2"; + modDirVersion = "4.20.0-rc2"; extraMeta.branch = "4.20"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0nf3rk8768740smkbf2ilsm40p1pnnmrpf53pmc5k1dkj4kgc0pb"; + sha256 = "0vmzrsfdg8sjyq833szirsv83wj2lgd92hy1fw5rp7xnjavn69hc"; }; # Should the testing kernels ever be built on Hydra? |