matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(cache): move nix-fast-build-pkg to overlays
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-12-11 11:42:40 -05:00
parent 08e1645697
commit 3cb4315fab
4 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
devices/servivi/modules/binary-cache.nix
View file

@ -1,35 +1,24 @@
{ {
config, config,
mainUser, mainUser,
nix-eval-jobs,
nix-fast-build,
pkgs, pkgs,
... ...
}: let }: let
# FIXME: move nix-fast-build-pkg to overlays, make #nixFastChecks an attrset of all, packages, devices and aptDevices. add binary cache at apartment # FIXME: make #nixFastChecks an attrset of all, packages, devices and aptDevices
# add binary cache at apartment
inherit (builtins) attrValues;
inherit (config.sops) secrets; inherit (config.sops) secrets;
nix-fast-build-pkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
nix-eval-jobs =
nix-eval-jobs.packages.${pkgs.system}.default.override {
nix = config.nix.package;
}
// {
nix = config.nix.package;
};
};
nixFastBuild = pkgs.writeShellApplication { nixFastBuild = pkgs.writeShellApplication {
name = "nixFastBuild"; name = "nixFastBuild";
runtimeInputs = builtins.attrValues { runtimeInputs = attrValues {
inherit inherit
(pkgs) (pkgs)
gnugrep gnugrep
nix-fast-build
nix-output-monitor nix-output-monitor
; ;
inherit nix-fast-build-pkg;
}; };
text = '' text = ''
@ -45,11 +34,10 @@
in { in {
services.nix-serve = { services.nix-serve = {
enable = true; enable = true;
package = pkgs.nix-serve-ng;
secretKeyFile = secrets.binary-cache-key.path; secretKeyFile = secrets.binary-cache-key.path;
}; };
environment.systemPackages = [nix-fast-build-pkg nixFastBuild]; environment.systemPackages = [pkgs.nix-fast-build nixFastBuild];
# Populate cache # Populate cache
systemd = { systemd = {
@ -60,17 +48,16 @@ in {
Group = config.users.users.${mainUser}.group; Group = config.users.users.${mainUser}.group;
}; };
path = builtins.attrValues { path = attrValues {
inherit inherit
(pkgs) (pkgs)
bash bash
git git
nix-fast-build
openssh openssh
; ;
inherit (config.nix) package; inherit (config.nix) package;
inherit nix-fast-build-pkg;
}; };
script = '' script = ''

2
outputs.nix
View file

@ -134,7 +134,7 @@
perSystem (pkgs: perSystem (pkgs:
import ./packages {inherit inputs mkVersion pkgs;}); import ./packages {inherit inputs mkVersion pkgs;});
overlays = import ./overlays {}; overlays = import ./overlays {inherit self;};
apps = apps =
perSystem (pkgs: perSystem (pkgs:

4
overlays/default.nix
View file

@ -1,5 +1,5 @@
{...}: { {self, ...}: {
build-failures = import ./build-failures; build-failures = import ./build-failures;
nix-version = import ./nix-version; nix-version = import ./nix-version self;
xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde; xdg-desktop-portal-kde = import ./xdg-desktop-portal-kde;
} }

27
overlays/nix-version/default.nix
View file

@ -1,15 +1,26 @@
{nix ? null}: ( self: {nix ? null}: final: prev: let
final: prev: inherit (builtins) mapAttrs;
builtins.mapAttrs inherit (self.inputs) nix-eval-jobs nix-fast-build;
(n: v:
nullCheck = n: v:
if nix == null if nix == null
then prev.${n} then prev.${n}
else v) else v;
{ in
mapAttrs nullCheck {
inherit nix; inherit nix;
nix-serve-ng = prev.nix-serve-ng.override { nix-serve = prev.nix-serve-ng.override {
inherit nix; inherit nix;
}; };
nix-fast-build = nix-fast-build.packages.${final.system}.nix-fast-build.override {
nix-eval-jobs =
nix-eval-jobs.packages.${final.system}.default.override {
inherit nix;
}
// {
inherit nix;
};
};
} }
)