diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-27 23:06:43 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-27 23:29:53 +0200 |
| commit | 01eb8ec98a52c1e7317fd62f5bc58db30951e716 (patch) | |
| tree | 3d662c37356a259f0c02c84c1aa9d76dba65f9f6 /pkgs/os-specific/linux | |
| parent | 5086684eadd9577b374522a767368fb6b1dd2f1d (diff) | |
| download | nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar.gz nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar.bz2 nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar.lz nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar.xz nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.tar.zst nixpkgs-01eb8ec98a52c1e7317fd62f5bc58db30951e716.zip | |
linux_5_13: drop
5.13.19 was the last 5.13 release and the version is now EOL[1]. [1] https://lwn.net/Articles/869747/
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/patches.json | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.13.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 4 |
3 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 36c7b557818..9b9ffbe3052 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-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.7-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix deleted file mode 100644 index 3f5ae2e13f5..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ /dev/null @@ -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 { })) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index a12633eb6d7..b5c629e8509 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -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; }; }) |