qo.is/infrastructure
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Activity Actions

Upgrade inputs to 24.11 #16

Merged
fabianhauser merged 21 commits from upgrade-2411 into main 2024-12-13 21:33:08 +01:00
Conversation 0 Commits 21 Files changed 60 +33 -16
2 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cf86743d68 - Show all commits

35
defaults/base-minimal/default.nix
View file

@ -52,21 +52,26 @@
# Package management # Package management
nix = { nix = {
settings = { settings =
trusted-users = [ let
"root" substituters = [
"@wheel" "https://${inputs.self.nixosConfigurations.lindberg-build.config.qois.nixpkgs-cache.hostname}?priority=39"
]; "https://cache.nixos.org?priority=40"
substituters = [ "https://attic.qo.is/qois-infrastructure"
"https://${inputs.self.nixosConfigurations.lindberg-build.config.qois.nixpkgs-cache.hostname}?priority=39" ];
"https://cache.nixos.org?priority=40" in
"https://attic.qo.is/qois-infrastructure" {
]; trusted-users = [
trusted-public-keys = [ "root"
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "@wheel"
"qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE=" ];
]; trusted-public-keys = [
}; "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE="
];
trusted-substituters = substituters; # For hosts that limit the subst list
inherit substituters;
};
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";

14
nixos-configurations/lindberg-build/applications/default.nix
View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }: {
config,
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
@ -8,4 +13,11 @@
qois.git-ci-runner.enable = true; qois.git-ci-runner.enable = true;
qois.postgresql.package = pkgs.postgresql_15; qois.postgresql.package = pkgs.postgresql_15;
# Remove substituters that are hosted on this node, to prevent lockups.
# The qois-infrastructure cache is not needed,
# since the builds are done (and cached) on this host anyway.
nix.settings.substituters = lib.mkForce [
"https://cache.nixos.org?priority=40"
];
} }