qo.is/infrastructure
4
0
Fork 0
Code Issues 13 Pull requests 1 Projects 1 Activity Actions

chore(deps): update nixpkgs to nixos-25.05 #79

Merged
fabianhauser merged 4 commits from renovate/nixpkgs-25.x into main 2025-06-29 19:45:03 +02:00
Conversation 2 Commits 4 Files changed 10 +26 -26
10 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -133,16 +133,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751048012, "lastModified": 1750969886,
"narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=", "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a684c58d46ebbede49f280b653b9e56100aa3877", "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -5,7 +5,7 @@
extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE="; extra-trusted-public-keys = "qois-infrastructure:lh35ymN7Aoxm5Hz0S6JusxE+cYzMU+x9OMKjDVIpfuE=";
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
treefmt-nix = { treefmt-nix = {
url = "github:numtide/treefmt-nix"; url = "github:numtide/treefmt-nix";

2
nixos-configurations/calanda/default.nix
View file

@ -16,5 +16,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

2
nixos-configurations/cyprianspitz/default.nix
View file

@ -23,5 +23,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

2
nixos-configurations/lindberg-build/default.nix
View file

@ -19,5 +19,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

2
nixos-configurations/lindberg-nextcloud/default.nix
View file

@ -46,5 +46,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

2
nixos-configurations/lindberg-webapps/default.nix
View file

@ -19,5 +19,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

2
nixos-configurations/lindberg/default.nix
View file

@ -24,5 +24,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "25.05"; # Did you read the comment?
} }

24
nixos-modules/cloud/default.nix
View file

@ -83,16 +83,22 @@ with lib;
}; };
phpOptions = { phpOptions = {
"opcache.interned_strings_buffer" = "23"; "opcache.interned_strings_buffer" = "64";
"opcache.memory_consumption" = "512";
"opcache.save_comments" = "1";
"opcache.max_accelerated_files" = "50000";
"opcache.fast_shutdown" = "1";
"opcache.jit" = "1255";
"opcache.jit_buffer_size" = "8M";
}; };
poolSettings = { poolSettings = {
"pm" = "dynamic"; "pm" = "dynamic";
"pm.max_children" = "256"; "pm.max_children" = "480";
"pm.max_requests" = "500"; "pm.max_requests" = "2000";
"pm.max_spare_servers" = "16"; "pm.max_spare_servers" = "72";
"pm.min_spare_servers" = "2"; "pm.min_spare_servers" = "24";
"pm.start_servers" = "8"; "pm.start_servers" = "48";
}; };
configureRedis = true; configureRedis = true;
@ -116,12 +122,6 @@ with lib;
}; };
}; };
services.phpfpm.pools.nextcloud.settings = {
"pm.max_children" = lib.mkForce "256";
"pm.max_spare_servers" = lib.mkForce "16";
"pm.start_servers" = lib.mkForce "8";
};
users.users.nextcloud.extraGroups = [ "postdrop" ]; users.users.nextcloud.extraGroups = [ "postdrop" ];
systemd.services.nextcloud-cron = { systemd.services.nextcloud-cron = {

6
nixos-modules/static-page/test.py
View file

@ -14,9 +14,9 @@ def test(subtest, webserver):
value = node.succeed( value = node.succeed(
f"curl -s --no-location -o /dev/null -w '%{{{variable}}}' '{url}'" f"curl -s --no-location -o /dev/null -w '%{{{variable}}}' '{url}'"
) )
assert ( assert value == expected, (
value == expected f"expected {variable} to be '{expected}' but got '{value}'"
), f"expected {variable} to be '{expected}' but got '{value}'" )
def expect_http_code(node, code, url): def expect_http_code(node, code, url):
curl_variable_test(node, "http_code", code, url) curl_variable_test(node, "http_code", code, url)