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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-08-26 08:43:29 +02:00
parent 49aa282108 b61ad0afc2
commit 081bd762e5
174 changed files with 2892 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -1,22 +1,22 @@
{
"4.14": {
"name": "linux-hardened-4.14.193.a.patch",
"sha256": "0hxr4v6ph29p0916dh894aknna5qxszcpz5xrci81xla3i50vy9v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch"
"name": "linux-hardened-4.14.194.a.patch",
"sha256": "07z3lr3mbm6c95d7fra2qp071n1c45f9241cl19zs63g00avi11p",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.194.a/linux-hardened-4.14.194.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.140.a.patch",
"sha256": "03y0kp89wka9bjw44y2jqralnwi7rjxbgm7wym1ad5yqd4q29l4d",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch"
"name": "linux-hardened-4.19.141.a.patch",
"sha256": "0yiqkkp17pf9r6nakpnqhvmf8awpzp5n27cmh15ril7vn1y71sxw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.141.a/linux-hardened-4.19.141.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.59.a.patch",
"name": "linux-hardened-5.4.60.a.patch",
"sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch"
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.60.a/linux-hardened-5.4.60.a.patch"
},
"5.7": {
"name": "linux-hardened-5.7.16.a.patch",
"sha256": "1fiyd6qsf8r84p05cxhwma7zwi81xyn9pl6yci93n583z8n1k2sw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.16.a/linux-hardened-5.7.16.a.patch"
"name": "linux-hardened-5.7.17.a.patch",
"sha256": "181b473y0hkw076hsndw6nfynr2yhcaypj48iqnk25hzcj40nnaz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.17.a/linux-hardened-5.7.17.a.patch"
}
}

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

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.8";
version = "5.8.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1xgibkwb1yfl6qdlbxyagai0qc1pk5ark7giz1512hh6ma353xz7";
sha256 = "0y8prifvkywqsx5lk80bh31m505vinmicpvdrirgg0c9scg7x8lf";
};
} // (args.argsOverride or {}))

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

@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.9-rc1";
version = "5.9-rc2";
extraMeta.branch = "5.9";
# 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 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla";
sha256 = "0mdh6gsd305kcgfqzyfgl5m886asjm5030ahg63gyias3ywzn5wd";
};
# Should the testing kernels ever be built on Hydra?

20
pkgs/os-specific/linux/rfkill/default.nix
View File

@@ -1,20 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "rfkill-0.5";
src = fetchurl {
url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2";
sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill";
description = "A tool to query, enable and disable wireless devices";
platforms = platforms.linux;
maintainers = [ maintainers.eelco ];
license = licenses.isc;
};
}