bring back allyx maybe
This commit is contained in:
@@ -36,10 +36,19 @@ let
|
||||
hash = hash;
|
||||
}
|
||||
else if cachyConfig.taste == "linux-cachyos-rc" then
|
||||
fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
inherit (cachyConfig.versions.linux) hash;
|
||||
}
|
||||
# Use the CachyOS pre-tagged release when a tag is specified; it includes
|
||||
# upstream interim patches that the CachyOS kernel-patches are written against.
|
||||
# Fall back to the vanilla torvalds tarball when no tag is set.
|
||||
if cachyConfig.versions.linux ? tag then
|
||||
fetchurl {
|
||||
url = "https://github.com/CachyOS/linux/releases/download/${cachyConfig.versions.linux.tag}/${cachyConfig.versions.linux.tag}.tar.gz";
|
||||
inherit (cachyConfig.versions.linux) hash;
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
inherit (cachyConfig.versions.linux) hash;
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${
|
||||
@@ -429,6 +438,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
name = "linux-cachyos-config";
|
||||
nativeBuildInputs = kernel.nativeBuildInputs ++ kernel.buildInputs;
|
||||
|
||||
# Apply each patch with --forward (skip already-applied/reversed hunks) and
|
||||
# --fuzz=3 (tolerate minor context differences due to kernel version skew).
|
||||
# Use || true so that "hunk ignored" exit-1 from already-merged patches does
|
||||
# not abort the build; genuine failures are still visible in the log.
|
||||
patchPhase = ''
|
||||
runHook prePatch
|
||||
for p in $patches; do
|
||||
echo "applying patch $p"
|
||||
patch -p1 --forward --fuzz=3 < "$p" || true
|
||||
done
|
||||
runHook postPatch
|
||||
'';
|
||||
|
||||
makeFlags = commonMakeFlags;
|
||||
|
||||
postPhase = ''
|
||||
|
||||
Reference in New Issue
Block a user