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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2020-09-16 17:58:45 +02:00
parent c7f34f9bad 60df61b67e
commit 372f89cc44
192 changed files with 9186 additions and 4203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/kernel/hardened/patches.json
+6 -6
View File
@@ -10,9 +10,9 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.64.a.patch",
"sha256": "1wkkvs66bmgqvgy1iqjck0c0mdad8lnwl42n5npw4ynjhfgiwp3b",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.64.a/linux-hardened-5.4.64.a.patch"
"name": "linux-hardened-5.4.65.a.patch",
"sha256": "028nxwjy2sp5bvi9m76nl9x1gyrk4752p376bwvz1h47ljw2hwni",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.65.a/linux-hardened-5.4.65.a.patch"
},
"5.7": {
"name": "linux-hardened-5.7.19.a.patch",
@@ -20,8 +20,8 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch"
},
"5.8": {
"name": "linux-hardened-5.8.8.a.patch",
"sha256": "0nm6k8mb51wwwpmb65ragdkxrvljr3dxslaad3l4x0d0yah4d93z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.8.a/linux-hardened-5.8.8.a.patch"
"name": "linux-hardened-5.8.9.a.patch",
"sha256": "1911zxi39h2s98n7xlpym0isbdcj964ymavywvw2lh18nry8934m",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.9.a/linux-hardened-5.8.9.a.patch"
}
}
pkgs/os-specific/linux/kernel/linux-4.14.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.197";
version = "4.14.198";
# 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 = "029h46yki2hxdbn7afmnf3yar1pnwrpszx76irsa5mf8gnrasyp0";
sha256 = "00xmij2l4qmx1s07hplxkn9ddlwiyalh2l5fqdk6d8v031cbmyhy";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.144";
version = "4.19.145";
# 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 = "0jnj65bdy5y9lcj5zhrn4iaszpww8z41ac66j00l75sd931l1g9k";
sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.4.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.235";
version = "4.4.236";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0w5pkv936zb0shjgnpv17gcp5n8f91djznzq54p6j1bl5q2qdyqd";
sha256 = "1v1mx16x1crnxf4pix0bhw40lq89n7wpd66gjc2mhxi75h6x6i80";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.235";
version = "4.9.236";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1hqcb3zw4546h6x5xy2mywdznha8813lx15mxbgfbvwm4qhsc9g6";
sha256 = "1ma2z0nvby4qyxzi3vxa28f0wvlnl74njk6cryjrqaksq6161qp7";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.4.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.4.64";
version = "5.4.65";
# 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 = "1vymhl6p7i06gfgpw9iv75bvga5sj5kgv46i1ykqiwv6hj9w5lxr";
sha256 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m";
};
} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.8.nix
+2 -2
View File
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.8.8";
version = "5.8.9";
# 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 = "0xm901zvvrwsb9k88la6pb65nybi43bygiyz1z68njwsx6ripxik";
sha256 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r";
};
} // (args.argsOverride or {}))