From c170ebf123eac184afecfcf0d05eddc1b8340c24 Mon Sep 17 00:00:00 2001 From: emily Date: Mon, 22 Jul 2024 00:01:49 +0200 Subject: [PATCH] Add gccarch system-feature --- config/profiles/builder.nix | 5 ++++- config/services/hydra/nix-config.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config/profiles/builder.nix b/config/profiles/builder.nix index 896f3da..8408085 100644 --- a/config/profiles/builder.nix +++ b/config/profiles/builder.nix @@ -1,7 +1,10 @@ { lib, pkgs, ... }: { kyouma.deployment.auto-upgrade.cache = "daemon"; nix.gc.options = lib.mkForce "--delete-older-than 60d"; - nix.settings.trusted-users = [ "build" ]; + nix.settings = { + trusted-users = [ "build" ]; + system-features = [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ lib.optionals pkgs.hostPlatform.isx86_64 [ "gccarch-x86-64-v3" ]; + }; nix.extraOptions = '' min-free = ${builtins.toString (4096 * 1024 * 1024)} max-free = ${builtins.toString (8192 * 1024 * 1024)} diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index 351d4bf..761b4d8 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -6,7 +6,7 @@ maxJobs = 40; speedFactor = 40; systems = [ "x86_64-linux" ]; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" "gccarch-x86-64-v3" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } {