check
This commit is contained in:
@@ -69,11 +69,6 @@ let
|
||||
description = "Linux EEVDF-BORE scheduler Kernel by CachyOS built with LLVM and Thin LTO";
|
||||
};
|
||||
|
||||
ltoFullKernelAttrs = ltoKernelAttrs // {
|
||||
configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
|
||||
useLTO = "full";
|
||||
};
|
||||
|
||||
serverLtoKernelAttrs = ltoKernelAttrs // {
|
||||
taste = "linux-cachyos-server";
|
||||
pname = "cachyos-server-lto";
|
||||
@@ -211,39 +206,58 @@ in
|
||||
cachyos-gcc = mkCachyKernel gccKernelAttrs;
|
||||
|
||||
# GCC LTS
|
||||
cachyos-lts = mkCachyKernel (gccKernelAttrs // ltsAttrs // {
|
||||
taste = "linux-cachyos-lts";
|
||||
pname = "cachyos-lts";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-lts.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-lts = mkCachyKernel (
|
||||
gccKernelAttrs
|
||||
// ltsAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-lts";
|
||||
pname = "cachyos-lts";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-lts.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# GCC RC
|
||||
cachyos-rc = mkCachyKernel (gccKernelAttrs // rcAttrs // {
|
||||
taste = "linux-cachyos-rc";
|
||||
pname = "cachyos-rc";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-rc.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-rc = mkCachyKernel (
|
||||
gccKernelAttrs
|
||||
// rcAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-rc";
|
||||
pname = "cachyos-rc";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-rc.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# Server GCC
|
||||
cachyos-server = mkCachyKernel (gccKernelAttrs // serverAttrs // {
|
||||
taste = "linux-cachyos-server";
|
||||
pname = "cachyos-server";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-server.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-server = mkCachyKernel (
|
||||
gccKernelAttrs
|
||||
// serverAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-server";
|
||||
pname = "cachyos-server";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-server.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# Hardened GCC
|
||||
cachyos-hardened = mkCachyKernel (gccKernelAttrs // hardenedAttrs // {
|
||||
taste = "linux-cachyos-hardened";
|
||||
pname = "cachyos-hardened";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-hardened.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-hardened = mkCachyKernel (
|
||||
gccKernelAttrs
|
||||
// hardenedAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-hardened";
|
||||
pname = "cachyos-hardened";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-hardened.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# Deckify GCC
|
||||
cachyos-deckify = mkCachyKernel (gccKernelAttrs // {
|
||||
taste = "linux-cachyos-deckify";
|
||||
pname = "cachyos-deckify";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-deckify.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-deckify = mkCachyKernel (
|
||||
gccKernelAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-deckify";
|
||||
pname = "cachyos-deckify";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-deckify.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# ######################################################
|
||||
# LTO Kernels #
|
||||
@@ -253,24 +267,28 @@ in
|
||||
cachyos-lto = mkCachyKernel ltoKernelAttrs;
|
||||
|
||||
# LTO Full
|
||||
cachyos-lto-full = mkCachyKernel (ltoKernelAttrs // {
|
||||
configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
|
||||
useLTO = "full";
|
||||
});
|
||||
cachyos-lto-full = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// {
|
||||
configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
|
||||
useLTO = "full";
|
||||
}
|
||||
);
|
||||
|
||||
# LTO Zen Version 4
|
||||
cachyos-lto-znver4 = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// {
|
||||
pname = "cachyos-lto-znver4";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-znver4.${arch}-linux.nix;
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-znver4.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# LTS LTO
|
||||
cachyos-lts-lto = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// ltsAttrs // {
|
||||
// ltsAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-lts";
|
||||
pname = "cachyos-lts-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-lts-lto.${arch}-linux.nix;
|
||||
@@ -280,7 +298,8 @@ in
|
||||
# Hardened LTO
|
||||
cachyos-hardened-lto = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// hardenedAttrs // {
|
||||
// hardenedAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-hardened";
|
||||
pname = "cachyos-hardened-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-hardened-lto.${arch}-linux.nix;
|
||||
@@ -290,7 +309,8 @@ in
|
||||
# RC LTO
|
||||
cachyos-rc-lto = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// rcAttrs // {
|
||||
// rcAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-rc";
|
||||
pname = "cachyos-rc-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-rc-lto.${arch}-linux.nix;
|
||||
@@ -300,7 +320,8 @@ in
|
||||
# RC LTO Zen Version 4
|
||||
cachyos-rc-lto-znver4 = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// rcAttrs // {
|
||||
// rcAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-rc";
|
||||
pname = "cachyos-rc-lto-znver4";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-rc-lto-znver4.${arch}-linux.nix;
|
||||
@@ -308,11 +329,15 @@ in
|
||||
);
|
||||
|
||||
# Server LTO
|
||||
cachyos-server-lto = mkCachyKernel (ltoKernelAttrs // serverAttrs // {
|
||||
taste = "linux-cachyos-server";
|
||||
pname = "cachyos-server-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-server-lto.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-server-lto = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// serverAttrs
|
||||
// {
|
||||
taste = "linux-cachyos-server";
|
||||
pname = "cachyos-server-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-server-lto.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# Server LTO Zen Version 4
|
||||
cachyos-server-lto-znver4 = mkCachyKernel (
|
||||
@@ -324,10 +349,13 @@ in
|
||||
);
|
||||
|
||||
# Deckify LTO
|
||||
cachyos-deckify-lto = mkCachyKernel (ltoKernelAttrs // {
|
||||
pname = "linux-cachyos-deckify-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-deckify-lto.${arch}-linux.nix;
|
||||
});
|
||||
cachyos-deckify-lto = mkCachyKernel (
|
||||
ltoKernelAttrs
|
||||
// {
|
||||
pname = "linux-cachyos-deckify-lto";
|
||||
configPath = ./config-nix/${arch}-linux/cachyos-deckify-lto.${arch}-linux.nix;
|
||||
}
|
||||
);
|
||||
|
||||
# ######################################################
|
||||
# Cachy ZFZ #
|
||||
|
||||
@@ -344,7 +344,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = ogKernelConfigfile.meta // {
|
||||
# at the time of this writing, they don't have config files for aarch64
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
udev,
|
||||
systemd,
|
||||
withVoutDrm ? true,
|
||||
stdenv ? null,
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -14,9 +14,9 @@ let
|
||||
tag = "stable_20250916";
|
||||
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
|
||||
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
|
||||
# modDirVersion = "6.18.1";
|
||||
# tag = "unstable_20251226";
|
||||
# hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
|
||||
# modDirVersion = "6.18.1";
|
||||
# tag = "unstable_20251226";
|
||||
# hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
|
||||
in
|
||||
lib.overrideDerivation
|
||||
(buildLinux (
|
||||
@@ -70,7 +70,7 @@ lib.overrideDerivation
|
||||
}
|
||||
// (args.argsOverride or { })
|
||||
))
|
||||
(oldAttrs: {
|
||||
(_oldAttrs: {
|
||||
postConfigure = ''
|
||||
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
|
||||
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
|
||||
|
||||
@@ -60,4 +60,4 @@ stdenvNoCC.mkDerivation {
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lopsided98 ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
# Maybe due to https://github.com/NixOS/nix/issues/847
|
||||
broken = stdenvNoCC.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec {
|
||||
# Maybe due to https://github.com/NixOS/nix/issues/847
|
||||
broken = stdenvNoCC.hostPlatform.isDarwin;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
pname = "uefi-rpi4";
|
||||
version = "1.50";
|
||||
|
||||
src= fetchzip {
|
||||
src = fetchzip {
|
||||
url = "https://github.com/pftf/RPi4/releases/download/v${version}/RPi4_UEFI_Firmware_v${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-g8046/Ox0hZgvU6u3ZfC6HMqoTME0Y7NsZD6NvUsp7w=";
|
||||
|
||||
@@ -1,38 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "uefi-rpi5";
|
||||
version = "0.3";
|
||||
version = "test1";
|
||||
|
||||
src= fetchzip {
|
||||
url = "https://github.com/worproject/rpi5-uefi/releases/download/v${version}/RPi5_UEFI_Release_v${version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-bjEvq7KlEFANnFVL0LyexXEeoXj7rHGnwQpq09PhIb0=";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/NumberOneGit/rpi5-uefi/releases/download/${version}/RPI_EFI.fd";
|
||||
hash = "sha256-GIgru10KCol9PXcdgR2d1BHf2In07OQ2P1kru7GUupY=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
dontBuild = true;
|
||||
# Firmware blobs do not need fixing and should not be modified
|
||||
dontFixup = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/firmware"
|
||||
mkdir -p "$out"
|
||||
|
||||
cp -rv "${src}" "$out/firmware"
|
||||
cp -rv "$src" "$out"
|
||||
cat > "$out/config.txt" <<'EOF'
|
||||
armstub=RPI_EFI.fd
|
||||
device_tree_address=0x3e0000
|
||||
device_tree_end=0x400000
|
||||
|
||||
# Force 32 bpp framebuffer allocation.
|
||||
framebuffer_depth=32
|
||||
|
||||
# Disable compensation for displays with overscan.
|
||||
disable_overscan=1
|
||||
|
||||
# Force maximum USB power regardless of the power supply.
|
||||
usb_max_current_enable=1
|
||||
|
||||
# Force maximum CPU speed.
|
||||
force_turbo=1
|
||||
EOF
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "RPI5 UEFI firmware";
|
||||
homepage = "https://github.com/pftf/RPi4";
|
||||
homepage = "https://github.com/NumberOneGit/rpi5-uefi";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,33 +1,18 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
bc,
|
||||
bison,
|
||||
dtc,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
flex,
|
||||
gnutls,
|
||||
installShellFiles,
|
||||
libuuid,
|
||||
meson-tools,
|
||||
ncurses,
|
||||
openssl,
|
||||
rkbin,
|
||||
swig,
|
||||
which,
|
||||
python3,
|
||||
perl,
|
||||
armTrustedFirmwareAllwinner,
|
||||
armTrustedFirmwareAllwinnerH6,
|
||||
armTrustedFirmwareAllwinnerH616,
|
||||
armTrustedFirmwareRK3328,
|
||||
armTrustedFirmwareRK3399,
|
||||
armTrustedFirmwareRK3568,
|
||||
armTrustedFirmwareRK3588,
|
||||
armTrustedFirmwareS905,
|
||||
opensbi,
|
||||
buildPackages,
|
||||
callPackages,
|
||||
darwin,
|
||||
@@ -57,7 +42,6 @@ let
|
||||
pythonScriptsToInstall ? { },
|
||||
installDir ? "$out",
|
||||
defconfig,
|
||||
extraConfig ? "",
|
||||
extraPatches ? [ ],
|
||||
extraMakeFlags ? [ ],
|
||||
extraMeta ? { },
|
||||
@@ -272,4 +256,4 @@ in
|
||||
extraMeta.platforms = [ "aarch64-linux" ];
|
||||
filesToInstall = [ "u-boot.bin" ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,4 +157,4 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user