summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfortuneteller2k <lythe1107@gmail.com>2021-06-24 11:45:02 +0800
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-06-24 11:03:22 +0000
commitcbf02c1c8035c51c2acea59f2b9f2873f6bc0f3c (patch)
tree4d00ff8d22639ed15fdf8428e30a6edd9ccf3328
parentMerge pull request #127877 from NixOS/backport-126014-to-release-21.05 (diff)
downloadnixpkgs-origin/backport-127977-to-release-21.05.tar.gz
linux_xanmod: 5.12.12 -> 5.12.13origin/backport-127977-to-release-21.05
(cherry picked from commit 419e4299a6a393fb514048dfe57a391f939a721b)
-rw-r--r--pkgs/os-specific/linux/kernel/linux-xanmod.nix4
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 4d6ff1ce76b2..5940d9e33b6d 100644
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
- version = "5.12.12";
+ version = "5.12.13";
suffix = "xanmod1-cacule";
in
buildLinux (args // rec {
@@ -12,7 +12,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
- sha256 = "sha256-99gVqdYhnBx3MDTCCHbxsljmvi+DixHp19vtNwCRM/M=";
+ sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ=";
};
extraMeta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 417c2e0faf88..a1869946a064 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20464,7 +20464,6 @@ in
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
- kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
];
};