mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
mjallen18
2025-12-11 19:14:52 -06:00
parent 31202f8b0e
commit 8d1a9312cb
13 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
overlays/linux-cachyos/default.nix
View File

@@ -1,10 +1,11 @@
{ inputs, lib, ... }:
{ inputs, lib, self, ... }:
final: prev: let
cachyosPackages = final.callPackage ../../packages/linux-cachyos {
pkgs = final;
nixpkgs = inputs.nixpkgs;
inherit self;
};
in {
linuxPackages_cachyos = cachyosPackages.cachyos-gcc;

4
packages/linux-cachyos/config-nix/cachyos-gcc.x86_64-linux.nix
View File

@@ -1072,6 +1072,7 @@
"CONFIG_NET_CRC32C" = "y";
"CONFIG_PACKET" = "y";
"CONFIG_PACKET_DIAG" = "m";
"CONFIG_INET_PSP" = "y";
"CONFIG_UNIX" = "y";
"CONFIG_AF_UNIX_OOB" = "y";
"CONFIG_UNIX_DIAG" = "m";
@@ -1095,6 +1096,7 @@
"CONFIG_SMC" = "m";
"CONFIG_SMC_DIAG" = "m";
"CONFIG_DIBS" = "m";
"CONFIG_DIBS_LO" = "y";
"CONFIG_XDP_SOCKETS" = "y";
"CONFIG_XDP_SOCKETS_DIAG" = "m";
"CONFIG_NET_HANDSHAKE" = "y";
@@ -2460,6 +2462,7 @@
"CONFIG_MD" = "y";
"CONFIG_BLK_DEV_MD" = "m";
"CONFIG_MD_BITMAP" = "y";
"CONFIG_MD_LLBITMAP" = "y";
"CONFIG_MD_BITMAP_FILE" = "y";
"CONFIG_MD_LINEAR" = "m";
"CONFIG_MD_RAID0" = "m";
@@ -2836,6 +2839,7 @@
"CONFIG_MLX5_SF" = "y";
"CONFIG_MLX5_SF_MANAGER" = "y";
"CONFIG_MLX5_DPLL" = "m";
"CONFIG_MLX5_EN_PSP" = "y";
"CONFIG_MLXSW_CORE" = "m";
"CONFIG_MLXSW_CORE_HWMON" = "y";
"CONFIG_MLXSW_CORE_THERMAL" = "y";

4
packages/linux-cachyos/config-nix/cachyos-lto.x86_64-linux.nix
View File

@@ -1073,6 +1073,7 @@
"CONFIG_NET_CRC32C" = "y";
"CONFIG_PACKET" = "y";
"CONFIG_PACKET_DIAG" = "m";
"CONFIG_INET_PSP" = "y";
"CONFIG_UNIX" = "y";
"CONFIG_AF_UNIX_OOB" = "y";
"CONFIG_UNIX_DIAG" = "m";
@@ -1096,6 +1097,7 @@
"CONFIG_SMC" = "m";
"CONFIG_SMC_DIAG" = "m";
"CONFIG_DIBS" = "m";
"CONFIG_DIBS_LO" = "y";
"CONFIG_XDP_SOCKETS" = "y";
"CONFIG_XDP_SOCKETS_DIAG" = "m";
"CONFIG_NET_HANDSHAKE" = "y";
@@ -2461,6 +2463,7 @@
"CONFIG_MD" = "y";
"CONFIG_BLK_DEV_MD" = "m";
"CONFIG_MD_BITMAP" = "y";
"CONFIG_MD_LLBITMAP" = "y";
"CONFIG_MD_BITMAP_FILE" = "y";
"CONFIG_MD_LINEAR" = "m";
"CONFIG_MD_RAID0" = "m";
@@ -2837,6 +2840,7 @@
"CONFIG_MLX5_SF" = "y";
"CONFIG_MLX5_SF_MANAGER" = "y";
"CONFIG_MLX5_DPLL" = "m";
"CONFIG_MLX5_EN_PSP" = "y";
"CONFIG_MLXSW_CORE" = "m";
"CONFIG_MLXSW_CORE_HWMON" = "y";
"CONFIG_MLXSW_CORE_THERMAL" = "y";

4
packages/linux-cachyos/config-nix/cachyos-rc.x86_64-linux.nix
View File

@@ -1072,6 +1072,7 @@
"CONFIG_NET_CRC32C" = "y";
"CONFIG_PACKET" = "y";
"CONFIG_PACKET_DIAG" = "m";
"CONFIG_INET_PSP" = "y";
"CONFIG_UNIX" = "y";
"CONFIG_AF_UNIX_OOB" = "y";
"CONFIG_UNIX_DIAG" = "m";
@@ -1095,6 +1096,7 @@
"CONFIG_SMC" = "m";
"CONFIG_SMC_DIAG" = "m";
"CONFIG_DIBS" = "m";
"CONFIG_DIBS_LO" = "y";
"CONFIG_XDP_SOCKETS" = "y";
"CONFIG_XDP_SOCKETS_DIAG" = "m";
"CONFIG_NET_HANDSHAKE" = "y";
@@ -2460,6 +2462,7 @@
"CONFIG_MD" = "y";
"CONFIG_BLK_DEV_MD" = "m";
"CONFIG_MD_BITMAP" = "y";
"CONFIG_MD_LLBITMAP" = "y";
"CONFIG_MD_BITMAP_FILE" = "y";
"CONFIG_MD_LINEAR" = "m";
"CONFIG_MD_RAID0" = "m";
@@ -2836,6 +2839,7 @@
"CONFIG_MLX5_SF" = "y";
"CONFIG_MLX5_SF_MANAGER" = "y";
"CONFIG_MLX5_DPLL" = "m";
"CONFIG_MLX5_EN_PSP" = "y";
"CONFIG_MLXSW_CORE" = "m";
"CONFIG_MLXSW_CORE_HWMON" = "y";
"CONFIG_MLXSW_CORE_THERMAL" = "y";

4
packages/linux-cachyos/config-nix/cachyos-server.x86_64-linux.nix
View File

@@ -1066,6 +1066,7 @@
"CONFIG_NET_CRC32C" = "y";
"CONFIG_PACKET" = "y";
"CONFIG_PACKET_DIAG" = "m";
"CONFIG_INET_PSP" = "y";
"CONFIG_UNIX" = "y";
"CONFIG_AF_UNIX_OOB" = "y";
"CONFIG_UNIX_DIAG" = "m";
@@ -1089,6 +1090,7 @@
"CONFIG_SMC" = "m";
"CONFIG_SMC_DIAG" = "m";
"CONFIG_DIBS" = "m";
"CONFIG_DIBS_LO" = "y";
"CONFIG_XDP_SOCKETS" = "y";
"CONFIG_XDP_SOCKETS_DIAG" = "m";
"CONFIG_NET_HANDSHAKE" = "y";
@@ -2454,6 +2456,7 @@
"CONFIG_MD" = "y";
"CONFIG_BLK_DEV_MD" = "m";
"CONFIG_MD_BITMAP" = "y";
"CONFIG_MD_LLBITMAP" = "y";
"CONFIG_MD_BITMAP_FILE" = "y";
"CONFIG_MD_LINEAR" = "m";
"CONFIG_MD_RAID0" = "m";
@@ -2830,6 +2833,7 @@
"CONFIG_MLX5_SF" = "y";
"CONFIG_MLX5_SF_MANAGER" = "y";
"CONFIG_MLX5_DPLL" = "m";
"CONFIG_MLX5_EN_PSP" = "y";
"CONFIG_MLXSW_CORE" = "m";
"CONFIG_MLXSW_CORE_HWMON" = "y";
"CONFIG_MLXSW_CORE_THERMAL" = "y";

15
packages/linux-cachyos/default.nix
View File

@@ -4,8 +4,12 @@
lib,
callPackage,
zfs_2_3,
# 1. Add 'inputs' generic argument (passed by Snowfall Lib)
inputs ? { },
# 2. Make 'self' optional, defaulting to inputs.self (handles both Overlay and Snowfall cases)
self ? inputs.self,
...
}@inputs:
}@args: # 3. Rename this capture from 'inputs' to 'args' to avoid variable name collision
let
inherit (stdenv) isx86_64 isLinux;
@@ -21,10 +25,11 @@ let
taste = "linux-cachyos";
configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
inherit (import ./lib/llvm-pkgs.nix inputs) callPackage;
# Pass the unified arguments (including the resolved 'self') to llvm-pkgs
inherit (import ./lib/llvm-pkgs.nix (args // { inherit self; })) callPackage;
useLTO = "thin";
packagesExtend = import ./lib/llvm-module-overlay.nix inputs;
packagesExtend = import ./lib/llvm-module-overlay.nix args;
zfsOverride = {
inherit (pkgs)
@@ -75,7 +80,7 @@ let
}
else
{
callPackage ? inputs.callPackage,
callPackage ? args.callPackage,
...
}@attrs:
callPackage ./packages-for.nix (
@@ -175,4 +180,4 @@ in
};
postPatch = builtins.replaceStrings [ "grep --quiet '^Linux-M" ] [ "# " ] prevAttrs.postPatch;
});
}
}

6
packages/linux-cachyos/lib/llvm-module-overlay.nix
View File

@@ -1,4 +1,4 @@
{ final, ... }:
{ pkgs, lib, ... }:
kernel: _finalModules: prevModules:
let
@@ -28,7 +28,7 @@ let
prevDrv:
prevDrv.overrideAttrs (prevAttrs: {
passthru = prevAttrs.passthru // {
settings = overrideFull (final // final.xorg) prevAttrs.passthru.settings;
settings = overrideFull (pkgs // pkgs.xorg) prevAttrs.passthru.settings;
};
});
in
@@ -37,7 +37,7 @@ with prevModules;
evdi =
multiOverride prevModules.evdi
{
inherit (final) python3;
inherit (pkgs) python3;
}
(prevAttrs: rec {
env = prevAttrs.env // {

10
packages/linux-cachyos/lib/llvm-pkgs.nix
View File

@@ -1,8 +1,8 @@
{
final,
flakes,
pkgs,
self,
...
}:
}@inputs:
let
# Don't waste user's time.
markBroken =
@@ -13,9 +13,9 @@ let
};
});
in
(final.pkgsLLVM.extend flakes.self.overlays.default).extend (
(pkgs.pkgsLLVM.extend self.overlays.default).extend (
_finalLLVM: prevLLVM: {
inherit (final)
inherit (pkgs)
dbus
libdrm
libgbm

15
packages/linux-cachyos/packages-for.nix
View File

@@ -8,6 +8,7 @@
linuxPackagesFor,
fetchFromGitHub,
lib,
pkgs,
buildPackages,
ogKernelConfigfile ? linuxPackages.kernel.passthru.configfile,
withUpdateScript ? null,
@@ -30,7 +31,9 @@
withoutDebug ? false,
description ? "Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements",
# For flakes
inputs,
inputs ? { },
# Explicitly accept nixpkgs, falling back to inputs or the system path
nixpkgs ? inputs.nixpkgs or pkgs.path,
}:
let
@@ -106,12 +109,14 @@ let
kernelPatches = [ ];
configfile = preparedConfigfile;
config = linuxConfigTransfomed;
# For tests
inherit (inputs) flakes final;
# For tests: Use 'or null' so it doesn't crash if inputs is empty
flakes = inputs.flakes or null;
final = inputs.final or null;
kernelPackages = packagesWithRightPlatforms;
};
commonMakeFlags = import "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/common-flags.nix" {
# Use 'nixpkgs' argument instead of 'inputs.nixpkgs'
commonMakeFlags = import "${nixpkgs}/pkgs/os-specific/linux/kernel/common-flags.nix" {
inherit
lib
stdenv
@@ -124,7 +129,7 @@ let
addOurs = finalAttrs: prevAttrs: {
kernel_configfile = prevAttrs.kernel.configfile;
zfs_cachyos =
(finalAttrs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/zfs/generic.nix"
(finalAttrs.callPackage "${nixpkgs}/pkgs/os-specific/linux/zfs/generic.nix"
zfsOverride
{
kernelModuleAttribute = "zfs_cachyos";

8
packages/linux-cachyos/versions-hardened.json
View File

@@ -5,12 +5,12 @@
"hash": "sha256-bQiAO5U8UJ30jUTTKB7TklJDIdi7NT6yHAVVeQyPjgY="
},
"config": {
"rev": "40aacb76c4f391fbeede811b7dfee1ea7e778e9f",
"hash": "sha256-vshDmoDLtbOfha0HKQPOdud4+gkeF8M+oaoj1Npt4rM="
"rev": "4e182cb7b8fca0077c06987b853312f25566e520",
"hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k="
},
"patches": {
"rev": "b8f46aff318e08b1d088b8d6f8f46c7f463a78cc",
"hash": "sha256-WyNbpFLNUMhOgezAsOpjRovuDz2LcyU2gwrN99xG5dg="
"rev": "5f5c847f252b91bc7127af8a3430b1153c28533d",
"hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

8
packages/linux-cachyos/versions-lts.json
View File

@@ -5,12 +5,12 @@
"hash": "sha256-pjCWshR0EdaDzsv4diK7L/SIW6wrNkHT1PECUMic3Pg="
},
"config": {
"rev": "acf85ecb3d8a03fb9fd3160ce6d9bdb05ef1c124",
"hash": "sha256-FgEoeJWSlq3keIsY8WAjudBX49MWvTKoLZBuyiPpp5k="
"rev": "4e182cb7b8fca0077c06987b853312f25566e520",
"hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k="
},
"patches": {
"rev": "0ac7e72d6b9f973a1682806d0166042869aa4144",
"hash": "sha256-0hQy5EoDK2p/smbzg1QOoJVV7oapnGr3Tu4KT8tU9xw="
"rev": "5f5c847f252b91bc7127af8a3430b1153c28533d",
"hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

12
packages/linux-cachyos/versions-rc.json
View File

@@ -5,15 +5,15 @@
"hash": "sha256-SikW8FoO2bdxr5nOdxCwB7YYuTwVjNdUngK4AhivzDU="
},
"config": {
"rev": "40aacb76c4f391fbeede811b7dfee1ea7e778e9f",
"hash": "sha256-vshDmoDLtbOfha0HKQPOdud4+gkeF8M+oaoj1Npt4rM="
"rev": "4e182cb7b8fca0077c06987b853312f25566e520",
"hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k="
},
"patches": {
"rev": "b8f46aff318e08b1d088b8d6f8f46c7f463a78cc",
"hash": "sha256-WyNbpFLNUMhOgezAsOpjRovuDz2LcyU2gwrN99xG5dg="
"rev": "5f5c847f252b91bc7127af8a3430b1153c28533d",
"hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",
"hash": "sha256-N+d7AnvE8X6+NU/FuBvs8OeHalMwo2cra1LdA7QWOx8="
"rev": "7de9800e5ce45d03c797be57a3e959fc914b2adb",
"hash": "sha256-FctR3yy/APamDo4O0bXoRoJBldJGrTsTm5RBgTDkLKc="
}
}

8
packages/linux-cachyos/versions.json
View File

@@ -8,13 +8,13 @@
},
"_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos",
"config": {
"rev": "5c8cf82f0ea40b72aec3fcbc58b449ca3b7cd372",
"hash": "sha256-dAGAdWms3poNhxPniYU3YmxFeJ9ngfBhakMQwCnCV/w="
"rev": "4e182cb7b8fca0077c06987b853312f25566e520",
"hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k="
},
"_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y",
"patches": {
"rev": "6dfdbc7f8f3ee4d9f5dc8adfb0672ef5d8e1e3d5",
"hash": "sha256-TJJKd86jDyighG3Jx8MNyiuQTpEIMAsA2GkWpqttwFg="
"rev": "5f5c847f252b91bc7127af8a3430b1153c28533d",
"hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I="
},
"_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD",
"zfs": {