diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-29 10:19:39 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-29 10:19:39 +0100 |
| commit | fb6652529723cbb122111b588c01bdf62edbce42 (patch) | |
| tree | 0c2bc41cbc9c7cf60205eb2db56dc797eff07c3e /pkgs/os-specific/linux/kernel | |
| parent | 332cfab4cee02852378d3a61f9f5035099488717 (diff) | |
| parent | 62ef779f2a5050549772722665bedf52f01268d2 (diff) | |
| download | nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar.gz nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar.bz2 nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar.lz nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar.xz nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.tar.zst nixpkgs-fb6652529723cbb122111b588c01bdf62edbce42.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 707ca7ff7ec..a7d1d7e175b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17145"; + rev = "17151"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f89a7c93730..dcb274c9254 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-rc2"; + version = "5.5-rc3"; 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 = "1fs432ld5k1j68hflqdxby9mxa6a7xnw1m6z5lfb9341gjw078xc"; + sha256 = "1rf394d1d6c0mvf6006gq1bscq3jjcvj9xxmdwallfwpp9igs8id"; }; # Should the testing kernels ever be built on Hydra? |