Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'

# Conflicts:
#	nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
#	nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
#	nixpkgs/pkgs/applications/window-managers/sway/default.nix
#	nixpkgs/pkgs/build-support/rust/default.nix
#	nixpkgs/pkgs/development/go-modules/generic/default.nix

1 files changed, 20 insertions, 20 deletions

diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index 95f736d94183..aa8988fae8e1 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -1,27 +1,27 @@
 { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
 
 let
-  version = "5.11.16";
+  version = "5.12.8";
   suffix = "xanmod1-cacule";
 in
-  buildLinux (args // rec {
-    modDirVersion = "${version}-${suffix}";
-    inherit version;
+buildLinux (args // rec {
+  modDirVersion = "${version}-${suffix}";
+  inherit version;
 
-    src = fetchFromGitHub {
-      owner = "xanmod";
-      repo = "linux";
-      rev = modDirVersion;
-      sha256 = "sha256-sK2DGJsmKP/gvPyT8HWjPa21OOXydMhGjJzrOkPo71Q=";
-      extraPostFetch = ''
-        rm $out/.config
-      '';
-    };
+  src = fetchFromGitHub {
+    owner = "xanmod";
+    repo = "linux";
+    rev = modDirVersion;
+    sha256 = "sha256-i3exBrEKyTHM2Iq8AJEIHwaw6KJarfcahlm/pPxAhmo=";
+    extraPostFetch = ''
+      rm $out/.config
+    '';
+  };
 
-    extraMeta = {
-      branch = "5.11";
-      maintainers = with lib.maintainers; [ fortuneteller2k ];
-      description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
-      broken = stdenv.hostPlatform.isAarch64;
-    };
-  } // (args.argsOverride or { }))
+  extraMeta = {
+    branch = "5.12-cacule";
+    maintainers = with lib.maintainers; [ fortuneteller2k ];
+    description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
+    broken = stdenv.hostPlatform.isAarch64;
+  };
+} // (args.argsOverride or { }))