This commit is contained in:
mjallen18
2026-01-21 21:43:31 -06:00
parent 94c3d6d6ff
commit e2e2d814fe
23 changed files with 478 additions and 572 deletions

View File

@@ -23,10 +23,11 @@ let
# Source Versions #
# ######################################################
versionSpec = importJSON ./version.json;
mkVersions = selected:
mkVersions =
selected:
let
s = selected.sources;
vars = selected.variables or {};
vars = selected.variables or { };
in
{
suffix = vars.suffix or "";

View File

@@ -18,11 +18,7 @@
final,
}:
let
version =
if stdenv.isAarch64 then
"6.12.47"
else
cachyConfig.versions.linux.version;
version = if stdenv.isAarch64 then "6.12.47" else cachyConfig.versions.linux.version;
# Single-value optional attr
optionalAttr =
key: pred: value:

View File

@@ -9,11 +9,7 @@
commonMakeFlags,
}:
let
version =
if stdenv.isAarch64 then
"6.12.47"
else
cachyConfig.versions.linux.version;
version = if stdenv.isAarch64 then "6.12.47" else cachyConfig.versions.linux.version;
majorMinor = lib.versions.majorMinor version;
@@ -36,26 +32,24 @@ let
inherit (cachyConfig.versions.linux) hash;
}
else
(
if stdenv.isAarch64
then
let
modDirVersion = "6.12.47";
tag = "stable_20250916";
hash = "sha256-Rjn+eWl5cLcc9wgjS3HYVaWM5eKMN3pPfPbsu+QGR/M=";
in
fetchurl {
url = "https://github.com/raspberrypi/linux/archive/refs/tags/${tag}.tar.gz";
hash = hash;
}
else
fetchurl {
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${
if version == "${majorMinor}.0" then majorMinor else version
}.tar.xz";
inherit (cachyConfig.versions.linux) hash;
}
);
(
if stdenv.isAarch64 then
let
tag = "stable_20250916";
hash = "sha256-Rjn+eWl5cLcc9wgjS3HYVaWM5eKMN3pPfPbsu+QGR/M=";
in
fetchurl {
url = "https://github.com/raspberrypi/linux/archive/refs/tags/${tag}.tar.gz";
hash = hash;
}
else
fetchurl {
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${
if version == "${majorMinor}.0" then majorMinor else version
}.tar.xz";
inherit (cachyConfig.versions.linux) hash;
}
);
schedPatches =
if cachyConfig.cpuSched == "eevdf" then
@@ -324,8 +318,8 @@ let
"-e CONFIG_PINCTRL_BCM2712"
"-e CONFIG_PINCTRL_BCM2835"
"-e CONFIG_ARCH_BCM"
"-e CONFIG_ARCH_BCM2835"
"-e CONFIG_ARCH_BRCMSTB"
"-e CONFIG_ARCH_BCM2835"
"-e CONFIG_ARCH_BRCMSTB"
"-e CONFIG_AHCI_BRCM"
"-e CONFIG_BRCMUTIL"
"-e CONFIG_BRCMSMAC"