public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-12-29 10:19:39 +01:00
parent 332cfab4ce 62ef779f2a
commit fb66525297
273 changed files with 4748 additions and 2531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@@ -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";
}
, ...

4
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@@ -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?