mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-26 10:30:32 +00:00
linux_xanmod: backport small refactor to allow clean backports
988bf19f2c (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.
This commit is contained in:
@@ -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=";
|
||||
};
|
||||
|
||||
main = {
|
||||
version = "6.11.3";
|
||||
hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc=";
|
||||
};
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.11.3";
|
||||
hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
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}";
|
||||
|
||||
@@ -64,6 +64,6 @@ let
|
||||
} // (args.argsOverride or { }));
|
||||
in
|
||||
{
|
||||
lts = xanmodKernelFor ltsVariant;
|
||||
main = xanmodKernelFor mainVariant;
|
||||
lts = xanmodKernelFor variants.lts;
|
||||
main = xanmodKernelFor variants.main;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user