diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-02 18:02:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 18:02:19 +0000 |
| commit | 3e5d1d00009a9a0cb384babe5dfdf782f911065c (patch) | |
| tree | 70cd594d9c181fe03846c59e05fdda9d406c8c6e /pkgs/os-specific/linux/kernel | |
| parent | 71d2c638821034c8453e53b75fa6267b648134a4 (diff) | |
| parent | ddb6f2f62805156a3521079a9fe0d1db714fb010 (diff) | |
| download | nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar.gz nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar.bz2 nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar.lz nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar.xz nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.tar.zst nixpkgs-3e5d1d00009a9a0cb384babe5dfdf782f911065c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/hardened/patches.json | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-5.19.nix | 18 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 |
3 files changed, 3 insertions, 31 deletions
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 713b566439e..bfcfa874add 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,16 +39,6 @@ "sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh", "version": "5.15.76" }, - "5.19": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-5.19.17-hardened1.patch", - "sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch" - }, - "sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9", - "version": "5.19.17" - }, "5.4": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix deleted file mode 100644 index 6137c36cb5c..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.19.17"; - - # 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 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9"; - }; -} // (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 6c3e739e27d..a80642334f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, commitDate ? "2022-09-28" -, currentCommit ? "24c6361e202cc09de0159505eb3ab3ca265520d8" -, diffHash ? "sha256-Y3uKkVMCaLGJpYb27ef3FfbqEQ32mgCVpWtYzvYamr8=" +, commitDate ? "2022-10-31" +, currentCommit ? "77c27f28aa58e9d9037eb68c87d3283f68c371f7" +, diffHash ? "sha256-TUpI9z0ac3rjn2oT5Z7oQXevDKbGwTVjyigS5/aGwgQ=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... |