From 9e413639bc2602f67d11a27df2a2817ba14d4962 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 8 Aug 2024 09:27:55 +1000 Subject: [PATCH] terraform/hydra-nixpkgs: add unfree-redist --- terraform/hydra-nixpkgs.tf | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/terraform/hydra-nixpkgs.tf b/terraform/hydra-nixpkgs.tf index 98dd585..920435e 100644 --- a/terraform/hydra-nixpkgs.tf +++ b/terraform/hydra-nixpkgs.tf @@ -28,6 +28,25 @@ locals { supported_systems = "[ \"x86_64-linux\" ]" variant = "rocm" } + unfree_redist = { + name = "unfree-redist" + description = "nixos-unstable-small unfree+redistributable" + nixpkgs_channel = "https://github.com/NixOS/nixpkgs.git nixos-unstable-small" + nixpkgs_release_file = "pkgs/top-level/release-unfree-redistributable.nix" + check_interval = 1800 + scheduling_shares = 5000 + supported_systems = "[ \"aarch64-linux\" \"x86_64-linux\" ]" + } + unfree_redist_full = { + name = "unfree-redist-full" + description = "nixos-unstable unfree+redistributable full" + nixpkgs_channel = "https://github.com/NixOS/nixpkgs.git nixos-unstable" + nixpkgs_release_file = "pkgs/top-level/release-unfree-redistributable.nix" + check_interval = 604800 + scheduling_shares = 1000 + supported_systems = "[ \"x86_64-linux\" ]" + full = "true" + } } } @@ -53,6 +72,17 @@ resource "hydra_jobset" "nixpkgs_jobset" { notify_committers = false } + dynamic "input" { + for_each = [for full in [lookup(each.value, "full", null)] : full if full != null] + + content { + name = "full" + type = "boolean" + value = input.value + notify_committers = false + } + } + dynamic "input" { for_each = [for variant in [lookup(each.value, "variant", null)] : variant if variant != null]