what a mess

This commit is contained in:
mjallen18
2026-01-20 12:17:57 -06:00
parent 5a992567b8
commit cedd4051f7
5 changed files with 36 additions and 10 deletions

View File

@@ -137,7 +137,7 @@ let
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ buildMachines = [
{ {
hostName = "10.0.1.18"; hostName = "pi5.local";
system = "aarch64-linux"; system = "aarch64-linux";
maxJobs = 4; maxJobs = 4;
sshUser = "matt"; sshUser = "matt";

View File

@@ -29,6 +29,12 @@ in
}; };
}); });
bcachefs = prev.bcachefs.overrideAttrs {
meta = prev.meta // {
broken = lib.mkForce null;
};
};
${namespace} = prev.${namespace} // { ${namespace} = prev.${namespace} // {
# GCC Kernels # GCC Kernels
# Latest # Latest

View File

@@ -9255,7 +9255,7 @@
"CONFIG_CRYPTO_SEQIV" = "m"; "CONFIG_CRYPTO_SEQIV" = "m";
"CONFIG_CRYPTO_ECHAINIV" = "m"; "CONFIG_CRYPTO_ECHAINIV" = "m";
"CONFIG_CRYPTO_ESSIV" = "m"; "CONFIG_CRYPTO_ESSIV" = "m";
"CONFIG_CRYPTO_BLAKE2B" = "y"; "CONFIG_CRYPTO_BLAKE2B" = "m";
"CONFIG_CRYPTO_CMAC" = "m"; "CONFIG_CRYPTO_CMAC" = "m";
"CONFIG_CRYPTO_GHASH" = "m"; "CONFIG_CRYPTO_GHASH" = "m";
"CONFIG_CRYPTO_HMAC" = "y"; "CONFIG_CRYPTO_HMAC" = "y";

View File

@@ -9,7 +9,12 @@
commonMakeFlags, commonMakeFlags,
}: }:
let let
inherit (cachyConfig.versions.linux) version; version =
if stdenv.isAarch64 then
version = "6.12.47";
else
cachyConfig.versions.linux.version;
majorMinor = lib.versions.majorMinor version; majorMinor = lib.versions.majorMinor version;
patches-src = fetchFromGitHub { patches-src = fetchFromGitHub {
@@ -31,12 +36,26 @@ let
inherit (cachyConfig.versions.linux) hash; inherit (cachyConfig.versions.linux) hash;
} }
else else
fetchurl { (
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${ if stdenv.isAarch64
if version == "${majorMinor}.0" then majorMinor else version then
}.tar.xz"; let
inherit (cachyConfig.versions.linux) hash; 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;
}
);
schedPatches = schedPatches =
if cachyConfig.cpuSched == "eevdf" then if cachyConfig.cpuSched == "eevdf" then
@@ -68,6 +87,7 @@ let
++ mArchConfig ++ mArchConfig
++ cpuSchedConfig ++ cpuSchedConfig
++ [ ++ [
"-m CONFIG_CRYPTO_BLAKE2B"
# _nr_cpus, defaults to empty, which later set this # _nr_cpus, defaults to empty, which later set this
"--set-val NR_CPUS 320" "--set-val NR_CPUS 320"

View File

@@ -5,7 +5,7 @@
... ...
}: }:
let let
kernel = pkgs.${namespace}.linuxPackages_cachyos-lto-znver4; kernel = pkgs.${namespace}.linuxPackages_cachyos-rc-lto-znver4;
pkgsVersion = pkgs; # .unstable; pkgsVersion = pkgs; # .unstable;
in in
{ {