Username404-59/nix-cachyos-kernel
1
0
Fork 0
mirror of https://github.com/xddxdd/nix-cachyos-kernel.git synced 2026-07-03 11:08:07 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix overriding zfs-cachyos kernel module (#67)

Browse Source
This commit is contained in:
Lan Tian 2026-04-20 22:42:58 -07:00
parent 8c8219b1f4
commit 6045b37a82
No known key found for this signature in database
GPG Key ID: 04E66B6B25A0862B
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel-cachyos/packages.nix
View File

@ -18,13 +18,12 @@ lib.mapAttrs' (
(linuxKernel.packagesFor v).extend ( (linuxKernel.packagesFor v).extend (
final: prev: final: prev:
let let
zfsVariant = lib.removePrefix "linux-cachyos-" v.cachyosConfigVariant; variant = lib.removePrefix "linux-cachyos-" v.cachyosConfigVariant;
zfsPackages = final.callPackage ../zfs-cachyos {
inherit inputs;
};
in in
{ {
zfs_cachyos = zfsPackages."${zfsVariant}" or zfsPackages.latest; zfs_cachyos = final.callPackage ../zfs-cachyos {
inherit inputs variant;
};
} }
) )
); );

5
zfs-cachyos/default.nix
View File

@ -2,18 +2,18 @@
inputs, inputs,
callPackage, callPackage,
kernel ? null, kernel ? null,
variant ? "latest",
lib, lib,
fetchurl, fetchurl,
}: }:
let let
versionJson = lib.importJSON ./version.json; versionJson = lib.importJSON ./version.json;
metadata = versionJson."${variant}" or versionJson.latest;
zfsGeneric = callPackage "${inputs.nixpkgs.outPath}/pkgs/os-specific/linux/zfs/generic.nix" { zfsGeneric = callPackage "${inputs.nixpkgs.outPath}/pkgs/os-specific/linux/zfs/generic.nix" {
inherit kernel; inherit kernel;
}; };
in in
# https://github.com/chaotic-cx/nyx/blob/aacb796ccd42be1555196c20013b9b674b71df75/pkgs/linux-cachyos/packages-for.nix#L99 # https://github.com/chaotic-cx/nyx/blob/aacb796ccd42be1555196c20013b9b674b71df75/pkgs/linux-cachyos/packages-for.nix#L99
lib.mapAttrs (
variant: metadata:
(zfsGeneric { (zfsGeneric {
kernelModuleAttribute = "zfs_cachyos"; kernelModuleAttribute = "zfs_cachyos";
kernelMinSupportedMajorMinor = "1.0"; kernelMinSupportedMajorMinor = "1.0";
@ -36,4 +36,3 @@ lib.mapAttrs (
cachyosVariant = variant; cachyosVariant = variant;
}; };
}) })
) versionJson