git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123043 from TredwellGit/linux
commitd47f3f1e883ecf86cb2b9350fb92d9fea4784b1b authorMartin Weinelt <mweinelt@users.noreply.github.com> dateSat 15 May 2021, 09:46 (6 years ago) parentef95fa4b9bb514
5 files changed+17−17
pkgs/os-specific/linux/kernel/hardened/patches.json+9−9 pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.11.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
pkgs/os-specific/linux/kernel/hardened/patches.json+9−9
@@ -13,20 +13,20 @@
1313 },
1414 "5.10": {
1515 "extra": "-hardened1",
16− "name": "linux-hardened-5.10.36-hardened1.patch",
17− "sha256": "0pkci99h0lrxyx5p7ml3m4194bl359m2ihm9izw0b33n35alkvbc",
18− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.36-hardened1/linux-hardened-5.10.36-hardened1.patch"
16+ "name": "linux-hardened-5.10.37-hardened1.patch",
17+ "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq",
18+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch"
1919 },
2020 "5.11": {
2121 "extra": "-hardened1",
22− "name": "linux-hardened-5.11.20-hardened1.patch",
23− "sha256": "06jf2r9xr8kzybia590x21p20mfags8j1flj0g4ci6r0fsfbmymf",
24− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.20-hardened1/linux-hardened-5.11.20-hardened1.patch"
22+ "name": "linux-hardened-5.11.21-hardened1.patch",
23+ "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g",
24+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch"
2525 },
2626 "5.4": {
2727 "extra": "-hardened1",
28− "name": "linux-hardened-5.4.118-hardened1.patch",
29− "sha256": "1zkcdxqysgcidary6nl4c2hrn6r23gi4r8rqhjan22xa3l3lj43b",
30− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.118-hardened1/linux-hardened-5.4.118-hardened1.patch"
28+ "name": "linux-hardened-5.4.119-hardened1.patch",
29+ "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9",
30+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch"
3131 }
3232}
pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.10.36";
6+ version = "5.10.37";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0s5jw7y17hnl66iybw6f4pbc5j5rilphqbv3iql22wq053vyg749";
16+ sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
pkgs/os-specific/linux/kernel/linux-5.11.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.11.20";
6+ version = "5.11.21";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "15q7pw1wvl6ndvb6154p6vjr4qa4fa6lpbqpxvwy2kywc2jyxykk";
16+ sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.12.3";
6+ version = "5.12.4";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "13c7jbizf254rh4arvlgzk87vx7sz6psba47jnax23lbgal18dqk";
16+ sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.4.118";
6+ version = "5.4.119";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "06w2vhw6pdy49n3dcnq12bn50glbg9pwaqvs4nlzbljg4yf50w6r";
16+ sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];