diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-08-16 11:08:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 11:08:42 +0200 |
| commit | e55554491df6e7b789d7f3d6a3b354df3575e1c6 (patch) | |
| tree | 5a8e1e4311da6a634f95da0c6aa8eb1c626f72db /pkgs/os-specific/linux/kernel | |
| parent | d51f83516578d092aba498cd42e74338af62c9a7 (diff) | |
| parent | 957f0485dab604c493d7683b8a57c0679b19e35f (diff) | |
| download | nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar.gz nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar.bz2 nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar.lz nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar.xz nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.tar.zst nixpkgs-e55554491df6e7b789d7f3d6a3b354df3575e1c6.zip | |
Merge pull request #133587 from TredwellGit/linux_5_12
linux_5_12: remove
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/patches.json | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.12.nix | 20 |
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3acd18a4b28..c3f0aa74257 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" }, - "5.12": { - "extra": "-hardened1", - "name": "linux-hardened-5.12.19-hardened1.patch", - "sha256": "1nr3922gd6il69k5cpp9g3knpy6yjb6jsmpi9k4v02bkvypg86dc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.19-hardened1/linux-hardened-5.12.19-hardened1.patch" - }, "5.4": { "extra": "-hardened1", "name": "linux-hardened-5.4.139-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix deleted file mode 100644 index e1e7aec2ce2..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.12.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 = "0wscz736n13m833cd12lskn47r0b8ki4fhgpjnwga0jsab9iqf79"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; -} // (args.argsOverride or {})) |