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:
github-actions[bot]
2021-02-11 18:16:48 +00:00
committed by GitHub
parent 1af73c223c bde46aca9e
commit 402b752521
35 changed files with 200 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,26 +1,26 @@
{
"4.14": {
"extra": "-hardened1",
"name": "linux-hardened-4.14.220-hardened1.patch",
"sha256": "083jc9lwr8lwxyfk4r39jcncf2g89srd50crj17jw9ysrp1jpyks",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.220-hardened1/linux-hardened-4.14.220-hardened1.patch"
"name": "linux-hardened-4.14.221-hardened1.patch",
"sha256": "167pazgz6xa0xmvkqdk0a9z1gp9ria0mm2wmq6g41wzhcy20zrfz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.221-hardened1/linux-hardened-4.14.221-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
"name": "linux-hardened-4.19.174-hardened1.patch",
"sha256": "1ggh7rjqm68gih41a9z2pzm1wm483165lvmigdp604p152157974",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.174-hardened1/linux-hardened-4.19.174-hardened1.patch"
"name": "linux-hardened-4.19.175-hardened1.patch",
"sha256": "04pflpzb8fs2wlx2sm46r1lxn4vcmhsygzk088m8rg3jjygany3i",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.175-hardened1/linux-hardened-4.19.175-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.14-hardened1.patch",
"sha256": "1l84hmwdkyd1nkby0w7vy9j0jhg866bpiw6hriav208dw2r0binx",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.14-hardened1/linux-hardened-5.10.14-hardened1.patch"
"name": "linux-hardened-5.10.15-hardened1.patch",
"sha256": "1xd0qr58lz38swivhrbhjf1jz3y8y4i9ba1qcij7bydw125qvz14",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.15-hardened1/linux-hardened-5.10.15-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.96-hardened1.patch",
"sha256": "05cb303llr2m5ik5f4v5ykr8ycldkrdb8gvjdr02zm8g0as7agil",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.96-hardened1/linux-hardened-5.4.96-hardened1.patch"
"name": "linux-hardened-5.4.97-hardened1.patch",
"sha256": "1610lgvxxx6rmbi38q3pcaf9kcw8fqxspwmg2irgmvvzniv5p42x",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.97-hardened1/linux-hardened-5.4.97-hardened1.patch"
}
}

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

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.220";
version = "4.14.221";
# 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/v4.x/linux-${version}.tar.xz";
sha256 = "1qip0c8nvfximgg4fj9xai741cgvi9f141bsps3zmrryjd796i6h";
sha256 = "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf";
};
} // (args.argsOverride or {}))

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

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.174";
version = "4.19.175";
# 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/v4.x/linux-${version}.tar.xz";
sha256 = "1rcy0hfbc3ny52mfrfysknm1q2scqz0g8l28j0qlyw8cx41wgxhg";
sha256 = "099b3dw9rj2z147dpjppd57g24paxw8x4fq1ir1ss5ibzy24pvnc";
};
} // (args.argsOverride or {}))

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

@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.256";
version = "4.4.257";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1z7vfy4h0mjvv0rcvvpb55x5fl16c6cgpcafz5gpjp0pw1p2lva8";
sha256 = "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy";
};
} // (args.argsOverride or {}))

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

@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.256";
version = "4.9.257";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "15qlv4m56dzv195xjy4yp8qsrkbmv51vwfg0qcm664hkrb4i32y4";
sha256 = "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm";
};
} // (args.argsOverride or {}))

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

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.14";
version = "5.10.15";
# 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 = "0ahxga1jdgn8kxln0pn8j42qxx0dhrhm9vcpwilyjnwb36gvf9zs";
sha256 = "00bf1v8zn4qngxhj6sca0lhv71xlnajw02iq6854s76my6y8flnq";
};
} // (args.argsOverride or {}))

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

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.96";
version = "5.4.97";
# 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 = "1q7mz69wzk1ps5770l9bj556qyndiz2frjjsl7pigsy5brlxwa7p";
sha256 = "0gs856v3q3m0q245mf8b9ivds8dizqrgjw27s9kbq3v31886da3i";
};
} // (args.argsOverride or {}))