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

Move loadPackages outside of the flake.nix (#82)

Browse Source 
Co-authored-by: Eman Resu <78693624+quatquatt@users.noreply.github.com>
This commit is contained in:
Eman Resu 2026-05-28 01:13:07 -04:00 committed by GitHub
parent a2cdbecf6a
commit aa5845f8b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
flake.nix
View File

@ -36,36 +36,6 @@
lib, lib,
... ...
}: }:
let
loadPackages =
pkgs:
let
load =
path:
lib.removeAttrs
(pkgs.callPackage path {
inherit inputs;
})
[
"override"
"overrideDerivation"
];
kernels = load ./kernel-cachyos;
packages = load ./kernel-cachyos/packages.nix;
in
kernels
// packages
// {
zfs-cachyos = packages.linuxPackages-cachyos-latest.zfs_cachyos;
zfs-cachyos-lto = packages.linuxPackages-cachyos-latest-lto.zfs_cachyos;
zfs-cachyos-lts = packages.linuxPackages-cachyos-lts.zfs_cachyos;
zfs-cachyos-lts-lto = packages.linuxPackages-cachyos-lts-lto.zfs_cachyos;
zfs-cachyos-hardened = packages.linuxPackages-cachyos-hardened.zfs_cachyos;
zfs-cachyos-hardened-lto = packages.linuxPackages-cachyos-hardened-lto.zfs_cachyos;
zfs-cachyos-rc = packages.linuxPackages-cachyos-rc.zfs_cachyos;
zfs-cachyos-rc-lto = packages.linuxPackages-cachyos-rc-lto.zfs_cachyos;
};
in
rec { rec {
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
@ -77,7 +47,7 @@
}: }:
rec { rec {
# Legacy packages contain linux-cachyos-* and linuxPackages-cachyos-* # Legacy packages contain linux-cachyos-* and linuxPackages-cachyos-*
legacyPackages = loadPackages pkgs; legacyPackages = import ./loadPackages.nix inputs pkgs;
# Packages only contain linux-cachyos-* due to Flake schema requirements # Packages only contain linux-cachyos-* due to Flake schema requirements
packages = lib.filterAttrs (_: lib.isDerivation) legacyPackages; packages = lib.filterAttrs (_: lib.isDerivation) legacyPackages;

28
loadPackages.nix Normal file
View File

@ -0,0 +1,28 @@
inputs:
pkgs:
let
load =
path:
pkgs.lib.removeAttrs
(pkgs.callPackage path {
inherit inputs;
})
[
"override"
"overrideDerivation"
];
kernels = load ./kernel-cachyos;
packages = load ./kernel-cachyos/packages.nix;
in
kernels
// packages
// {
zfs-cachyos = packages.linuxPackages-cachyos-latest.zfs_cachyos;
zfs-cachyos-lto = packages.linuxPackages-cachyos-latest-lto.zfs_cachyos;
zfs-cachyos-lts = packages.linuxPackages-cachyos-lts.zfs_cachyos;
zfs-cachyos-lts-lto = packages.linuxPackages-cachyos-lts-lto.zfs_cachyos;
zfs-cachyos-hardened = packages.linuxPackages-cachyos-hardened.zfs_cachyos;
zfs-cachyos-hardened-lto = packages.linuxPackages-cachyos-hardened-lto.zfs_cachyos;
zfs-cachyos-rc = packages.linuxPackages-cachyos-rc.zfs_cachyos;
zfs-cachyos-rc-lto = packages.linuxPackages-cachyos-rc-lto.zfs_cachyos;
}