cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #139665 from Ma27/drop-linux-5.13

Browse source 
linux_5_13: drop
This commit is contained in:
Maximilian Bosch 2021-09-29 13:10:10 +02:00 committed by GitHub
commit 7d890267d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/kernel-generic.nix
View file

@ -31,7 +31,6 @@ let
linuxPackages_4_19
linuxPackages_5_4
linuxPackages_5_10
linuxPackages_5_13
linuxPackages_5_14
linuxPackages_4_14_hardened

6
pkgs/os-specific/linux/kernel/hardened/patches.json
View file

@ -17,12 +17,6 @@
"sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"
},
"5.13": {
"extra": "-hardened1",
"name": "linux-hardened-5.13.19-hardened1.patch",
"sha256": "1cj99y2xn7l89lf4mn7arp0r98r4nmvql3ffjpngzv8hsf79xgg7",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.19-hardened1/linux-hardened-5.13.19-hardened1.patch"
},
"5.14": {
"extra": "-hardened1",
"name": "linux-hardened-5.14.8-hardened1.patch",

18
pkgs/os-specific/linux/kernel/linux-5.13.nix
View file

@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.13.19";
# 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;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0yxbcd1k4l4cmdn0hzcck4s0yvhvq9fpwp120dv9cz4i9rrfqxz8";
};
} // (args.argsOverride or { }))

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

@ -9,7 +9,7 @@
, ...
} @ args:
kernel.override ( args // {
(kernel.override ( args // {
argsOverride = {
version = "${kernel.version}-bcachefs-unstable-${date}";
@ -30,4 +30,4 @@ kernel.override ( args // {
extraConfig = "BCACHEFS_FS m";
} ] ++ kernelPatches;
})
})).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })

2
pkgs/top-level/aliases.nix
View file

@ -466,7 +466,6 @@ mapAliases ({
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_13 = linuxKernel.packages.linux_5_13;
linuxPackages_5_14 = linuxKernel.packages.linux_5_14;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
@ -483,7 +482,6 @@ mapAliases ({
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;
linux_5_13 = linuxKernel.kernels.linux_5_13;
linux_5_14 = linuxKernel.kernels.linux_5_14;
# added 2020-04-04

2
pkgs/top-level/all-packages.nix
View file

@ -21552,8 +21552,6 @@ with pkgs;
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened;
linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened;
linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;
linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;

12
pkgs/top-level/linux-kernels.nix
View file

@ -155,13 +155,6 @@ in {
];
};
linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -177,7 +170,7 @@ in {
};
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_5_13;
kernel = linux_5_14;
kernelPatches = kernel.kernelPatches;
};
@ -220,7 +213,6 @@ in {
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { };
linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };
}));
@ -458,7 +450,6 @@ in {
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13);
linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);
};
@ -489,7 +480,6 @@ in {
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { });
linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);