diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-14 10:20:32 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-14 10:20:32 +0100 |
commit | 05962c4ad558b6802e64e8992aebf2dfc946d34e (patch) | |
tree | 0fa0c4fd8cd03ca60fe09bd5816864281cbe8d39 /pkgs/os-specific/linux/kernel/linux-testing.nix | |
parent | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (diff) | |
parent | ec2ed2d316d850061ffa75a43f487928b0d7e7c3 (diff) | |
download | nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.gz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.bz2 nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.lz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.xz nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.tar.zst nixpkgs-05962c4ad558b6802e64e8992aebf2dfc946d34e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-testing.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1d3102e2a11..b6231b5a972 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5-rc5"; + version = "5.5-rc6"; extraMeta.branch = "5.5"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0h5ks0c0pdl0awiysqja6ky5ykhjcdicc01wi01wzhjklq9j0lmq"; + sha256 = "0y4rsxynn0qprrsxy4v5vr4ihhavn43yqqp1qfrrxsfw15djncc2"; }; # Should the testing kernels ever be built on Hydra? |