From f6b22a776eef0e10e04498d892ff16394f4ed912 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 18 Oct 2023 18:35:41 +0700 Subject: [PATCH] work around https://github.com/NixOS/hydra/issues/1186 --- extra-builtins.nix | 11 +++++++++-- home/common/firefox.nix | 2 +- system/hosts/server/home.nix | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/extra-builtins.nix b/extra-builtins.nix index 6352e17..6a8b067 100644 --- a/extra-builtins.nix +++ b/extra-builtins.nix @@ -13,11 +13,18 @@ )"'"' '' ]; in derivation { - inherit name; + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + preferLocalBuild = true; + allowSubstitutes = false; + allowedReferences = []; + passAsFile = [ "archive" ]; + inherit name archive; inherit (pkgs) system; builder = "${pkgs.bash}/bin/bash"; args = [ "-c" '' - echo '${archive}' | ${pkgs.coreutils}/bin/base64 -d | + ${pkgs.coreutils}/bin/base64 -d "$archivePath" | ${pkgs.gnutar}/bin/tar -P --transform="s#!#$out#" -I ${pkgs.zstd}/bin/zstd -x '' ]; }; diff --git a/home/common/firefox.nix b/home/common/firefox.nix index a5a0b9f..887a105 100644 --- a/home/common/firefox.nix +++ b/home/common/firefox.nix @@ -32,7 +32,7 @@ inherit (pkgs.librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles; wmClass = "LibreWolf"; libName = "librewolf"; - enableKeePassXC = true; + cfg.enableKeePassXC = true; }; profiles = { chayleaf = { diff --git a/system/hosts/server/home.nix b/system/hosts/server/home.nix index 5b8352f..63c513b 100644 --- a/system/hosts/server/home.nix +++ b/system/hosts/server/home.nix @@ -150,6 +150,8 @@ in { nix.daemonCPUSchedPolicy = "idle"; nix.daemonIOSchedClass = "idle"; systemd.services.hydra-evaluator = lib.mkIf config.services.hydra.enable { + # https://github.com/NixOS/hydra/issues/1186 + environment.GC_DONT_GC = "1"; serviceConfig.CPUQuota = "100%"; serviceConfig.CPUSchedulingPolicy = "idle"; serviceConfig.IOSchedulingClass = "idle";