Skip to content

Commit

Permalink
linux_xanmod: backport small refactor to allow clean backports
Browse files Browse the repository at this point in the history
988bf19 (among other things) refactored this
expression a little. This made backports no longer apply cleanly, requiring
manual backports which are tedious.

This commit backports only the part that refactors the version declaration in
order to make automated backports work again.

(The `variant` variable was unused.)

This is technically a refactor which shouldn't typically be backported but the
change is very minor and trivial to verify to be correct.
  • Loading branch information
Atemu committed Oct 15, 2024
1 parent db9c334 commit be5695f
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions pkgs/os-specific/linux/kernel/xanmod-kernels.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ let

# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
version = "6.6.56";
hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw=";
variant = "lts";
};
variants = {
lts = {
version = "6.6.56";
hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw=";
};

mainVariant = {
version = "6.11.3";
hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc=";
variant = "main";
main = {
version = "6.11.3";
hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc=";
};
};

xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
inherit version;
modDirVersion = lib.versions.pad 3 "${version}-${suffix}";

Expand Down Expand Up @@ -64,6 +64,6 @@ let
} // (args.argsOverride or { }));
in
{
lts = xanmodKernelFor ltsVariant;
main = xanmodKernelFor mainVariant;
lts = xanmodKernelFor variants.lts;
main = xanmodKernelFor variants.main;
}

0 comments on commit be5695f

Please sign in to comment.